Merge branch 'master' of http://182.92.169.222:3000/zhc077/zmd_kejiju

jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue

@@ -212,8 +212,8 @@
   //账号登录表单字段
   const formData = reactive<any>({
     inputCode: '',
-    username: 'admin',
+    username: '',
-    password: '123456',
+    password: '',
   });
   //手机登录表单字段
   const phoneFormData = reactive<any>({

jeecgboot-vue3/src/views/system/usersetting/BaseSetting.vue

@@ -39,10 +39,10 @@
           <span class="gray-75 item-label">性别</span>
           <span class="gray-3">{{ userInfo.sexText }}</span>
         </div>
-        <div class="margin-bottom-10 nowarp font-size-13">
+<!--        <div class="margin-bottom-10 nowarp font-size-13">-->
-          <span class="gray-75 item-label">职位</span>
+<!--          <span class="gray-75 item-label">职位</span>-->
-          <span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span>
+<!--          <span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span>-->
-        </div>
+<!--        </div>-->
         <div class="font-size-13">
           <span class="item-label"></span>
           <span class="item-label pointer" style="color:#1e88e5" @click="openEditModal">编辑</span>