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

admin

2020-05-12 522315ae42936583042fc08aabda7e3c9e7a7b5d

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java

@@ -265,6 +265,7 @@
         userActiveLog.setDeviceType("wxmp");

         userActiveLog.setDevice(acceptData.getDevice());

         userActiveLogService.addUserActiveLog(userActiveLog);

			


         // 处理用户信息

         outUserInfoHandle(userInfo);