TASK:代码合并;
This commit is contained in:
@@ -23,17 +23,17 @@ public class BaseEntity implements Serializable {
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createDate;
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
private Date updateDate;
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 是否已删除
|
||||
*/
|
||||
private Integer isDeleted;
|
||||
// private Integer isDeleted;
|
||||
|
||||
/**
|
||||
* 用户ID
|
||||
|
||||
Reference in New Issue
Block a user