From db7a53ebb32f960c8afd5a5e1863641c7e798682 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 27 Jun 2024 10:42:26 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=B7=E5=A4=96=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=20=E5=8D=95=E4=BD=8D=E5=8F=8A?=
 =?UTF-8?q?=E8=81=8C=E5=8A=A1=E6=8B=86=E4=B8=BA=E4=B8=A4=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/24年6月海外会议变更.sql                        |  7 +++++--
 .../meeting/entity/MeetingOverseasSituation.java  | 15 +++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/db/24年6月海外会议变更.sql b/db/24年6月海外会议变更.sql
index 66c9c22e..a7683831 100644
--- a/db/24年6月海外会议变更.sql
+++ b/db/24年6月海外会议变更.sql
@@ -9,7 +9,8 @@ create table pay_meeting_overseas_situation
     meeting_id               varchar(50)  null comment '会议id',
     photo                    varchar(50)  null comment '照片',
     name                     varchar(200) null comment '姓名',
-    unit                     varchar(200) null comment '职务及单位',
+    unit                     varchar(200) null comment '单位',
+    post                     varchar(200) null comment '职务',
     nationality              varchar(200) null comment '国籍',
     address                  varchar(200) null comment '地址',
     email                    varchar(200) null comment '邮箱',
@@ -33,11 +34,13 @@ create index pm_situation_idx_meeting_id
 alter table pay_meeting_overseas_situation
     add primary key (id);
 
+
+
 insert into sys_permission (id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external, external_terminal_show)
 values  ('1805490588726943746', '1430376424950026242', '海外会议报名信息编辑页', '/incomePayments/meetManage/SignUpInfoEditOverseas', 'incomePayments/meetManage/SignUpInfoEditOverseas', null, null, 1, null, '1', 13, 0, null, 1, 1, 0, 1, null, 'LKGLZ', '2024-06-25 14:37:55', 'LKGLZ', '2024-06-25 14:43:42', 0, 0, '1', 0, 1),
         ('1803343905960304641', '1803335479314161665', '删除', null, null, null, null, 2, 'overseasMeetingSituation:delete', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:27:46', null, null, 0, 0, '1', 0, 1),
         ('1803343796841291778', '1803335479314161665', '编辑', '', null, null, null, 2, 'overseasMeetingSituation:edit', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:27:20', null, null, 0, 0, '1', 0, 1),
-        ('1803343698526806018', '1803335479314161665', '批量删除', '', null, null, null, 2, 'overseasMeetingSituation:export', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:26:57', null, null, 0, 0, '1', 0, 1),
+        ('1803343698526806018', '1803335479314161665', '批量删除', '', null, null, null, 2, 'overseasMeetingSituation:batchDel', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:26:57', null, null, 0, 0, '1', 0, 1),
         ('1803343493899296770', '1803335479314161665', '导出', '', null, null, null, 2, 'overseasMeetingSituation:export', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:26:08', null, null, 0, 0, '1', 0, 1),
         ('1803343388232196098', '1803335479314161665', '添加参会人', '', null, null, null, 2, 'overseasMeetingSituation:add', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:25:43', null, null, 0, 0, '1', 0, 1),
         ('1803343206362980353', '1803335479314161665', '查询', null, null, null, null, 2, 'overseasMeetingSituation:search', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:25:00', null, null, 0, 0, '1', 0, 1),
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java
index 82c272f6..a5db50e1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java
@@ -82,11 +82,19 @@ public class MeetingOverseasSituation {
     private String name;
 
     /**
-     * 职务及单位
+     * 职务
+     */
+    @TableField(value = "post")
+    @ApiModelProperty(value = "职务")
+    @Excel(name = "职务", width = 15)
+    private String post;
+
+    /**
+     * 单位
      */
     @TableField(value = "unit")
-    @ApiModelProperty(value = "职务及单位")
-    @Excel(name = "职务及单位", width = 15)
+    @ApiModelProperty(value = "单位")
+    @Excel(name = "单位", width = 15)
     private String unit;
 
     /**
@@ -135,7 +143,6 @@ public class MeetingOverseasSituation {
      */
     @TableField(value = "foreign_name")
     @ApiModelProperty(value = "外文姓名")
-    @Excel(name = "外文姓名", width = 15)
     private String foreignName;
 
     /**