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

src/views/system/user.vue

@@ -483,7 +483,12 @@
                 {
                   label: "手机号码",
                   prop: "phone",
-                  overHidden: true
+                  overHidden: true,
+                  rules: [{
+                    required: true,
+                    message: "请输入手机号码",
+                    trigger: "blur"
+                  }]
                 },
                 {
                   label: "电子邮箱",
@@ -907,6 +912,12 @@
         if (!row.workingStatus) {
             row.workingStatus = '0'
         }
+        // 福达写死小程序
+        let userObj = JSON.parse(localStorage.getItem("saber-userInfo")).content;
+        if (userObj.tenant_id == '577435') {
+          // row.userType = 4
+          row.appletsId = 'wxa92adb24f1784863'
+        }
         update(row).then(() => {
           this.initFlag = false;
           this.onLoad(this.page);