Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.12_createImportTask.sql

@@ -0,0 +1,19 @@
+CREATE TABLE `import_task` (
+                               `ID` varchar(64) NOT NULL COMMENT 'ID',
+                               `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+                               `ORIGIN_FILE_NAME` varchar(128) NOT NULL COMMENT '原始文件名',
+                               `BIZ_TYPE` varchar(32) NOT NULL COMMENT '业务类型。【resi:居民；neighborHood:小区；building:楼栋；house:房屋；party_member:党员；society_org:社会组织；community_self_org:社区自组织】依次补充',
+                               `PROCESS_STATUS` varchar(32) NOT NULL COMMENT '处理状态。processing:处理中；finished_success:成功；finished_unsuccess:未完全成功',
+                               `OPERATOR_ID` varchar(64) NOT NULL COMMENT '谁导入的',
+                               `START_TIME` datetime NOT NULL COMMENT '开始导入的时间',
+                               `RESULT_DESC_FILE` varchar(255) DEFAULT NULL COMMENT '导入失败结果描述文件',
+                               `RESULT_DESC` varchar(255) DEFAULT NULL COMMENT '导入结果描述，可以输入任何描述信息',
+                               `DEL_FLAG` tinyint(1) NOT NULL COMMENT '删除标识：0.未删除 1.已删除',
+                               `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                               `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                               `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                               `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                               `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                               PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ImportTaskEntity.java

@@ -1,48 +0,0 @@
-package com.epmet.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * 
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2022-02-15
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("import_task")
-public class ImportTaskEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 业务类型。resi:居民；楼栋:building；房屋:house。依次补充
-     */
-	private String bizType;
-
-    /**
-     * 处理状态。processing:处理中；finished:完成；
-     */
-	private String processStatus;
-
-    /**
-     * 谁导入的
-     */
-	private String operatorId;
-
-    /**
-     * 开始导入的时间
-     */
-	private Date startTime;
-
-	private String resultDescFile;
-
-	private String resultDesc;
-
-}