记得上下班打卡 | git大法好,push需谨慎

Commit acc83ad9 authored by zhengfuxin's avatar zhengfuxin

Merge branch 'dev-0712activity' of...

Merge branch 'dev-0712activity' of gitlab.zhengzai.tv:dongjingwei/liquidnet-bus-v1 into dev-0712activity
parents 28ea08ac 73ea010c
...@@ -193,7 +193,7 @@ public class LocalAdminController extends BaseController ...@@ -193,7 +193,7 @@ public class LocalAdminController extends BaseController
@GetMapping("/createActivityModal") // 创建活动 @GetMapping("/createActivityModal") // 创建活动
public String createActivityModal() public String createActivityModal()
{ {
return activityPrefix + "/performanceActivity/CreateActivity"; return activityPrefix + "/performanceActivity/createActivity";
} }
@GetMapping("/activityTicketList") // 活动关联券部分 @GetMapping("/activityTicketList") // 活动关联券部分
public String activityTicketList() public String activityTicketList()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment