TASK:代码合并;

src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java

@@ -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