Merge remote-tracking branch 'remotes/origin/dev'

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java

@@ -32,7 +32,7 @@ public class SysDictDataDTO implements Serializable {
 
 	@Null(message="{id.null}", groups = AddGroup.class)
 	@NotNull(message="{id.require}", groups = UpdateGroup.class)
-	private Long id;
+	private String id;
 
 	@NotNull(message="{sysdict.type.require}", groups = DefaultGroup.class)
 	private Long dictTypeId;
@@ -50,8 +50,8 @@ public class SysDictDataDTO implements Serializable {
 	private Integer sort;
 
 	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
-	private Date createDate;
+	private Date createdTime;
 
 	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
-	private Date updateDate;
+	private Date updatedTime;
 }

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java

@@ -33,7 +33,7 @@ public class SysDictTypeDTO implements Serializable {
 
 	@Null(message="{id.null}", groups = AddGroup.class)
 	@NotNull(message="{id.require}", groups = UpdateGroup.class)
-	private Long id;
+	private String id;
 
 	@NotBlank(message="{sysdict.type.require}", groups = DefaultGroup.class)
 	private String dictType;
@@ -47,8 +47,8 @@ public class SysDictTypeDTO implements Serializable {
 	private Integer sort;
 
 	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
-	private Date createDate;
+	private Date createdTime;
 
 	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
-	private Date updateDate;
+	private Date updatedTime;
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/SysDictDataEntity.java

@@ -8,15 +8,13 @@
 
 package com.epmet.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.epmet.commons.mybatis.entity.BaseEntity;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 数据字典
  *
@@ -25,8 +23,10 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("sys_dict_data")
-public class SysDictDataEntity extends BaseEntity {
+public class SysDictDataEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
+	@TableId(type = IdType.ID_WORKER_STR)
+	private String id;
 	/**
 	 * 字典类型ID
 	 */
@@ -51,14 +51,4 @@ public class SysDictDataEntity extends BaseEntity {
 	 * 排序
 	 */
 	private Integer sort;
-	/**
-	 * 更新者
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Long updater;
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateDate;
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/SysDictTypeEntity.java

@@ -8,15 +8,13 @@
 
 package com.epmet.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.epmet.commons.mybatis.entity.BaseEntity;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 字典类型
  *
@@ -25,8 +23,11 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("sys_dict_type")
-public class SysDictTypeEntity extends BaseEntity {
+public class SysDictTypeEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
+
+	@TableId(type = IdType.ID_WORKER_STR)
+	private String id;
 	/**
 	 * 字典类型
 	 */
@@ -43,14 +44,4 @@ public class SysDictTypeEntity extends BaseEntity {
 	 * 排序
 	 */
 	private Integer sort;
-	/**
-	 * 更新者
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Long updater;
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateDate;
 }