From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ActivityController.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ActivityController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ActivityController.java
index 8b5df2b..158467b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ActivityController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ActivityController.java
@@ -32,7 +32,6 @@
@Resource
private ActivityService activityService;
- @RequestNoSignValidate()
@RequestMapping(value = "getDetail")
public void getDetail(String callback, Long activityId, PrintWriter out) {
--
Gitblit v1.8.0