Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

modules/all_models/user.js

@@ -42,6 +42,10 @@ let schema = {
     username: String,
     email: String,
     mobile: String,
+    qq: {
+        type: String,
+        default: ''
+    },
     real_name: {
         type: String,
         default: ''

modules/users/controllers/login_controller.js

@@ -71,6 +71,7 @@ class LoginController {
                     username: userData.username,
                     email: userData.useremail,
                     mobile: userData.mobile,
+                    qq: userData.qq,
                     isUserActive: userData.isUserActive,
                 };
 
@@ -252,6 +253,7 @@ class LoginController {
                 username: userData.username,
                 email: userData.useremail,
                 mobile: userData.mobile,
+                qq: userData.qq,
                 isUserActive: userData.isUserActive,
             };
 

modules/users/models/user_model.js

@@ -173,6 +173,7 @@ class UserModel extends BaseModel {
                 email : userData.email,
                 mobile : userData.mobile,
                 ssoId : userData.ssoId,
+                qq: userData.qq,
                 latest_login:userData.latest_login,
                 isUserActive: userData.isUserActive,
             };
@@ -355,8 +356,8 @@ class UserModel extends BaseModel {
         }
         return free
     }
-    
-    /* 
+
+    /*
     * 添加联系人，互相添加
     */
     async addContact(userID, contactID) {