From a116a0c61c31585181ba665b86346040067c2ae4 Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Tue, 13 May 2025 17:26:27 +0800
Subject: [PATCH] commit

---
 .../info/MemberGroupInfoController.java          |  3 ++-
 .../views/platform/member/info/GroupInfo.html    |  8 +++-----
 .../views/platform/member/inquire/Integrate.html | 16 ++++++----------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/info/MemberGroupInfoController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/info/MemberGroupInfoController.java
index dce464e..c01ede6 100644
--- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/info/MemberGroupInfoController.java
+++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/info/MemberGroupInfoController.java
@@ -117,7 +117,8 @@ public class MemberGroupInfoController {
                         marriage,
                         education,
                         hometown,
-                        nation
+                        nation,
+                        remark
                      from 
                         user 
                      $condition
diff --git a/src/main/resources/views/platform/member/info/GroupInfo.html b/src/main/resources/views/platform/member/info/GroupInfo.html
index 30286cc..998a10c 100644
--- a/src/main/resources/views/platform/member/info/GroupInfo.html
+++ b/src/main/resources/views/platform/member/info/GroupInfo.html
@@ -295,19 +295,17 @@ layout("/layouts/platform.html"){
                     {prop: 'idcard', label: '身份证号', width: 170},
                     {prop: 'position', label: '职务', sortable: true, checked: 0},
                     {prop: 'jobTitle', label: '职称', sortable: true, checked: 0},
-                    {prop: 'personType', label: '人员类型', sortable: true},
                     {prop: 'userState', label: '在职状态', sortable: true},
-                    {prop: 'political', label: '政治面貌', sortable: true},
+                    {prop: 'personType', label: '人员类型', sortable: true},
                     {prop: 'unionname', label: '所属工会', sortable: true},
                     {prop: 'unitname', label: '所属单位', sortable: true},
-                    {prop: 'threeUnitName', label: '所在科室', sortable: true, checked: 0},
-                    {prop: 'unionGroupName', label: '工会小组', sortable: true, checked: 0},
                     {prop: 'campusName', label: '所属校区', sortable: true, checked: 0},
                     {prop: 'marriage', label: '婚否', checked: 0},
                     {prop: 'education', label: '学历', checked: 0},
                     {prop: 'hometown', label: '籍贯', checked: 0},
                     {prop: 'nation', label: '民族', checked: 0},
-                    {prop: 'memberNumber', label: '会员号', checked: 0},
+                    {prop: 'political', label: '政治面貌', checked: 0},
+                    {prop: 'remark', label: '备注', checked: 0},
                 ],
                 personTypeOptions: [],
                 userStateOptions: [],
diff --git a/src/main/resources/views/platform/member/inquire/Integrate.html b/src/main/resources/views/platform/member/inquire/Integrate.html
index f38d929..055ceba 100644
--- a/src/main/resources/views/platform/member/inquire/Integrate.html
+++ b/src/main/resources/views/platform/member/inquire/Integrate.html
@@ -53,7 +53,7 @@ layout("/layouts/platform.html"){
             display: none;
         }
     }
-    
+
     .monthStyle{
 	    .el-date-picker__header--bordered {
 		    display: none !important;
@@ -287,8 +287,8 @@ layout("/layouts/platform.html"){
                         </el-link>
                     </el-col>
                 </el-row>
-	            
-	            
+
+
 	            <el-row type="flex" align="middle" class="query-row">
 		            <el-col class="query-row-title">费用类型：</el-col>
 		            <el-col class="query-row-content">
@@ -301,7 +301,7 @@ layout("/layouts/platform.html"){
 					            @click="tagClick('personalStatus',item.name)">
 				            {{ item.name }}
 			            </el-tag>
-			            
+
 			            <el-link type="danger"
 			                     v-if="personalStatusOptions.length&&pageForm.personalStatus.length"
 			                     :underline="false"
@@ -313,7 +313,7 @@ layout("/layouts/platform.html"){
 			            </el-link>
 		            </el-col>
 	            </el-row>
-	            
+
                 <el-row type="flex" align="middle" class="query-row">
                     <el-col class="query-row-title">系统角色：</el-col>
                     <el-col class="query-row-content">
@@ -643,20 +643,16 @@ layout("/layouts/platform.html"){
                     {prop: 'position', label: '职务', sortable: true, checked: 0},
                     {prop: 'jobTitle', label: '职称', sortable: true, checked: 0},
                     {prop: 'userState', label: '在职状态', sortable: true},
-                    {prop: 'personType', label: '人员类型', sortable: true},
                     {prop: 'preparedBy', label: '人员性质', sortable: true},
                     {prop: 'unionname', label: '所属工会', sortable: true},
                     {prop: 'unitname', label: '所属单位', sortable: true},
-                    {prop: 'threeUnitName', label: '所在科室', sortable: true},
-                    {prop: 'unionGroupName', label: '工会小组', sortable: true},
                     {prop: 'campusName', label: '所属校区', sortable: true, checked: 0},
                     {prop: 'marriage', label: '婚否', checked: 0},
                     {prop: 'education', label: '学历', checked: 0},
                     {prop: 'hometown', label: '籍贯', checked: 0},
                     {prop: 'nation', label: '民族', checked: 0},
                     {prop: 'political', label: '政治面貌', checked: 0},
-                    {prop: 'memberJoinTime', label: '入会时间', checked: 0},
-                    {prop: 'memberNumber', label: '会员号', checked: 0},
+                    {prop: 'remark', label: '备注', checked: 0},
                 ],
                 welfareMemberLoading: false,
             }