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

base-manager-ui/admin/src/pages/basicset/sms/configurat.vue

@@ -12,7 +12,12 @@
         {{ v }}
       </div>
     </div>
+    <a-tooltip>
+      <template slot="title">
+        当前状态：{{ setInfo.messageoff ? "开启" : "关闭" }}
+      </template>
       <YButton v-model="setInfo.messageoff" @change="changeClose"></YButton>
+    </a-tooltip>
   </div>
 </template>
 

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/userManagement.vue

@@ -181,7 +181,7 @@ export default {
       sourceInfoForm: {},
       userDict: {}, // 角色数据
       userform: {
-        type: 1,
+        type: 2,
         roleId: undefined,
         searchVal: undefined,
       },