From 3704e11b86fa50bf9f670de268a18e6de3b5d48a Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 03 十二月 2025 09:02:43 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.4' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.3.0.4

---
 src/views/UserManage/components/AddOrEditUserDialog.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/UserManage/components/AddOrEditUserDialog.vue b/src/views/UserManage/components/AddOrEditUserDialog.vue
index 5a34557..11061f7 100644
--- a/src/views/UserManage/components/AddOrEditUserDialog.vue
+++ b/src/views/UserManage/components/AddOrEditUserDialog.vue
@@ -26,22 +26,22 @@
         prop="password"
         :check-rules="[{ message: '璇疯緭鍏ュ瘑鐮�' }]"
       >
-        <ProFormText placeholder="璇疯緭鍏ヨ处鍙�" v-model.trim="innerForm.password"></ProFormText>
+        <ProFormText placeholder="璇疯緭鍏ュ瘑鐮�" v-model.trim="innerForm.password"></ProFormText>
       </ProFormItemV2>
       <ProFormItemV2
         v-if="!isEdit"
         label="鎿嶄綔瀵嗙爜"
         prop="operatorPassword"
         :check-rules="[
-          { message: '璇疯緭鍏ユ搷浣滃瘑鐮�' },
           {
+            required: false,
             message: '璇疯緭鍏�6浣嶆暟瀛�',
             pattern: /\b\d{6}\b/,
           },
         ]"
       >
         <ProFormText
-          placeholder="璇疯緭鍏ヨ处鍙�"
+          placeholder="璇疯緭鍏ユ搷浣滃瘑鐮�"
           v-model.trim="innerForm.operatorPassword"
         ></ProFormText>
       </ProFormItemV2>

--
Gitblit v1.9.1