fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by youfu
Commit a0bfa2a10d9132e885c8b75b1cabe1388754602e 1 parent 3c23a4c6

修改web girlday控制器的活动id

Inline Side-by-side
Showing 1 changed file with 1 additions and 5 deletions
@@ -14,13 +14,9 @@ use Plugin\Helpers; @@ -14,13 +14,9 @@ use Plugin\Helpers;
14 */ 14 */
15 class GirldayController extends HuodongAction 15 class GirldayController extends HuodongAction
16 { 16 {
17 -<<<<<<< HEAD 17 +
18 // const STATIC_VERSION = 'http://localhost:2222/1.0.1'; 18 // const STATIC_VERSION = 'http://localhost:2222/1.0.1';
19 const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.1'; 19 const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.1';
20 -=======  
21 - // const STATIC_VERSION = 'http://localhost:2222/1.0.2';  
22 - const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.2';  
23 ->>>>>>> 89ce101806024ff1d9da2d1507e6bef093cc26b1  
24 20
25 /** 21 /**
26 * 检测登录状态 22 * 检测登录状态