Merge branch 'dev' of https://github.com/metersphere/server into dev

frontend/src/business/components/settings/system/User.vue

@@ -53,7 +53,7 @@
                :destroy-on-close="true">
       <el-form :model="form" label-position="right" label-width="120px" size="small" :rules="rule" ref="createUserForm">
         <el-form-item label="ID" prop="id">
-          <el-input v-model="form.id" autocomplete="off" :placeholder="$t('user.input_id')"/>
+          <el-input v-model="form.id" autocomplete="off" :placeholder="$t('user.input_id_placeholder')"/>
         </el-form-item>
         <el-form-item :label="$t('commons.username')" prop="name">
           <el-input v-model="form.name" autocomplete="off" :placeholder="$t('user.input_name')"/>

frontend/src/i18n/en-US.js

@@ -174,6 +174,7 @@ export default {
     'mobile_number_format_is_incorrect': 'Mobile number format is incorrect',
     'email_format_is_incorrect': 'Email format is incorrect',
     'delete_confirm': 'Are you sure you want to delete this User?',
+    'input_id_placeholder': 'Please enter ID (only supports numbers and English letters)'
   },
   role: {
     'please_choose_role': 'Please Choose Role',

frontend/src/i18n/zh-CN.js

@@ -173,6 +173,7 @@ export default {
     'mobile_number_format_is_incorrect': '手机号码格式不正确',
     'email_format_is_incorrect': '邮箱格式不正确',
     'delete_confirm': '这个用户确定要删除吗?',
+    'input_id_placeholder': '请输入ID (只支持数字、英文字母)'
   },
   role: {
     'please_choose_role': '请选择角色',

frontend/src/i18n/zh-TW.js

@@ -171,6 +171,7 @@ export default {
     'mobile_number_format_is_incorrect': '手機號碼格式不正確',
     'email_format_is_incorrect': '郵箱格式不正確',
     'delete_confirm': '這個用戶確定要刪除嗎?',
+    'input_id_placeholder': '請輸入ID (只支持數字、英文字母)'
   },
   role: {
     'please_choose_role': '請選擇角色',