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

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

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

src/views/login/index.vue

@@ -320,11 +320,12 @@ export default {
       ).then((data) => {
         if (data.list && data.list.length > 0) {
           setTimeout(() => {
-            console.log(data)
-            console.log('???????--sparrow')
             this.$notify.info({
               title: '消息',
-              message: '您有【' + data.list.length + '】条相关方人员数据待审核'
+              message: '您有【' + data.list.length + '】条相关方人员数据待审核',
+              onClick: () => {
+                this.$router.push('/xgf/flow')
+              }
             })
           }, 3000)
         }

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>