From 9963cca077affc536fe2fefb2cc5f1f002d86f76 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 19 May 2022 10:24:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E5=AE=A2=E6=96=B0=E5=A2=9E=E4=B8=89?=
 =?UTF-8?q?=E7=A7=8D=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/power/dto/rent/RentTenantInfoDTO.java  | 15 +++++++++++++++
 .../modules/rent/entity/RentTenantInfoEntity.java | 15 +++++++++++++++
 .../V0.0.8__pli_rent_tenant_info_update.sql       |  3 +++
 .../resources/mapper/rent/RentTenantInfoDao.xml   |  5 ++++-
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.8__pli_rent_tenant_info_update.sql

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java
index 96df344..772ddf2 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java
@@ -82,6 +82,21 @@ public class RentTenantInfoDTO implements Serializable {
     )
     private Date updatedTime;
 
+    /**
+     * 政治面貌
+     */
+    private String politicalStatus;
+
+    /**
+     * 是否服兵役【是:1 否:0】
+     */
+    private String isMilitary;
+
+    /**
+     * 国籍
+     */
+    private String nation;
+
     /**
      * 头像列表
      */
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java
index 973d9ac..e45aefb 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java
@@ -69,6 +69,21 @@ public class RentTenantInfoEntity extends BaseEpmetEntity {
 	 */
 	private String customerId;
 
+	/**
+	 * 政治面貌
+	 */
+	private String politicalStatus;
+
+	/**
+	 * 是否服兵役【是:1 否:0】
+	 */
+	private String isMilitary;
+
+	/**
+	 * 国籍
+	 */
+	private String nation;
+
 	/**
 	 * 头像列表
 	 */
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.8__pli_rent_tenant_info_update.sql b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.8__pli_rent_tenant_info_update.sql
new file mode 100644
index 0000000..541e6d7
--- /dev/null
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.8__pli_rent_tenant_info_update.sql
@@ -0,0 +1,3 @@
+ALTER TABLE epmet_pli_power.pli_rent_tenant_info ADD POLITICAL_STATUS varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '政治面貌';
+ALTER TABLE epmet_pli_power.pli_rent_tenant_info ADD IS_MILITARY varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '是否服兵役【是:1 否:0】';
+ALTER TABLE epmet_pli_power.pli_rent_tenant_info ADD NATION varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '国籍';
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
index fdd7959..b355a83 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
@@ -44,7 +44,10 @@
         TYPE,
         STATE,
         CREATED_TIME,
-        UPDATED_TIME
+        UPDATED_TIME,
+        POLITICAL_STATUS,
+        IS_MILITARY,
+        NATION
         FROM
         pli_rent_tenant_info
         WHERE