Merge branch 'hotfix2' into develop

src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java

@@ -2,7 +2,6 @@ package au.com.royalpay.payment.manage.customers.web;
 
 import au.com.royalpay.payment.manage.customers.core.EncourageService;
 import au.com.royalpay.payment.tools.CommonConsts;
-import au.com.royalpay.payment.tools.permission.wechat.WechatMapping;
 
 import com.alibaba.fastjson.JSONObject;
 
@@ -50,7 +49,7 @@ public class EncourageMoneyController {
         return encourageService.doubleEncourageMoney(orderId);
     }
 
-    @WechatMapping(value = "/my", method = RequestMethod.GET)
+    @RequestMapping(value = "/my", method = RequestMethod.GET)
     public ModelAndView encourageLogs(@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser, @ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
         ModelAndView mav = new ModelAndView("activity/encourage_money/my");
         JSONObject user = new JSONObject();