Merge branch 'dev' into test

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;
+
     /**
      * 头像列表
      */

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;
+
 	/**
 	 * 头像列表
 	 */

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 '国籍';

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