Merge remote-tracking branch 'origin/div' into div

yujian

2020-04-27 d5c2554ebae75afbff31c3c2966cc3a747ba941c

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java

@@ -30,6 +30,7 @@
import com.yeshi.fanli.service.inter.push.IOSPushService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.annotation.UserActive;



import net.sf.json.JSONObject;



@@ -58,6 +59,7 @@
   @Resource

   private UserInfoExtraService userInfoExtraService;



   @UserActive(uid="#uid")

   @RequestMapping("getsystemclientparams")

   public void getSystemClientParams(AcceptData acceptData, Long uid, String mac, HttpServletRequest request,

         PrintWriter out) {