From fa3bdadaed3e2bad1f3d25b225683967c3ec5699 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Sat, 12 Oct 2024 08:53:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](hyx?=
 =?UTF-8?q?=5F2024-9-25=5Ftongbu)=20=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/corpInfo/user/components/edit.vue | 2 +-
 src/views/corpInfo/user/components/list.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue
index 21765ab..36197b6 100644
--- a/src/views/corpInfo/user/components/edit.vue
+++ b/src/views/corpInfo/user/components/edit.vue
@@ -717,7 +717,7 @@ export default {
   data() {
     var hasUser = (rule, value, callback) => {
       requestFN(
-        '/user/hasUser',
+        '/user/goCheck',
         {
           USERNAME: value,
           VERIFYUSER_ID: this.form.USER_ID
diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue
index 0509a79..38cb96c 100644
--- a/src/views/corpInfo/user/components/list.vue
+++ b/src/views/corpInfo/user/components/list.vue
@@ -798,7 +798,7 @@ export default {
           SHIFTDUTYTWO: this.SHIFTDUTYTWO,
           IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER,
           USER_ID: this.USER_ID,
-          ISPUSH: '2'
+          ISPUSH: '1'
         }
       ).then((data) => {
         this.listLoading = false

From ef06a7f9cded9941e8e1c6bcabe332ce3739e742 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Mon, 21 Oct 2024 08:49:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](hyx?=
 =?UTF-8?q?=5F2024-9-25=5Ftongbu)=20=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E6=B0=91=E6=97=8F=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flowApply/components/userInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue
index 8d585d8..68949ea 100644
--- a/src/views/xgf/flowApply/components/userInfo.vue
+++ b/src/views/xgf/flowApply/components/userInfo.vue
@@ -62,7 +62,7 @@
 
             <tr>
               <th>民族</th>
-              <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+              <td>{{ userDetailForm.NATIONALITY_NAME ? userDetailForm.NATIONALITY_NAME : '暂无信息' }}</td>
               <th>婚姻状况</th>
               <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
               <th>政治面貌</th>