Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TokenController.java

@@ -98,7 +98,7 @@ public class TokenController {
                 }
             }else if(type.equals("wx")){
                 String phone = form.getPhone();
-                String openId = request.getParameter("openId");
+                String openId = form.getOpenId();
                 if(count > 0){
                     userMapper.updateMbUser(phone,openId,userId,null, userInfo.getUserName());
                 }else {

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/LoginBody.java

@@ -42,6 +42,21 @@ public class LoginBody
      */
     private String type;
 
+    /**
+     * openId
+     */
+    private String openId;
+
+    public String getOpenId()
+    {
+        return openId;
+    }
+
+    public void setOpenId(String openId)
+    {
+        this.openId = openId;
+    }
+
     public String getType()
     {
         return type;