Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/entity/CapacityEngineerStat.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.sql.Timestamp;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 
 @Data
 @Data
 public class CapacityEngineerStat {
 public class CapacityEngineerStat {
@@ -16,6 +17,6 @@ public class CapacityEngineerStat {
 	private Integer orderCount;
 	private Integer orderCount;
 	private Integer maxDuration;
 	private Integer maxDuration;
 	private String memo;
 	private String memo;
-	private Timestamp createTime;
-	private Timestamp updateTime;
+	private LocalDateTime createTime;
+	private LocalDateTime updateTime;
 }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/CapacityEngineerStatEntity.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Data
 @Data
@@ -62,10 +63,10 @@ public class CapacityEngineerStatEntity {
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
     /**
     /**
      * 更新时间
      * 更新时间
      */
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/CapacityOrgStatEntity.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Data
 @Data
@@ -67,11 +68,11 @@ public class CapacityOrgStatEntity {
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
     /**
     /**
      * 更新时间
      * 更新时间
      */
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 
 }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/CapacityTeamStatEntity.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Entity
 @Entity
@@ -57,9 +58,9 @@ public class CapacityTeamStatEntity implements Serializable {
     private String memo;
     private String memo;
 
 
 
 
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
 
 
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 
 }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/EngineerInfoEntity.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Data
 @Data
@@ -99,12 +100,12 @@ public class EngineerInfoEntity {
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
     /**
     /**
      * 更新时间
      * 更新时间
      */
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 
     public EngineerInfoEntity() {}
     public EngineerInfoEntity() {}
 }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/MapBlockInfoEntity.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Entity
 @Entity
@@ -78,12 +79,12 @@ public class MapBlockInfoEntity {
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
     /**
     /**
      * 更新时间
      * 更新时间
      */
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 
     public MapBlockInfoEntity() {}
     public MapBlockInfoEntity() {}
 }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/OrderChangeEntity.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 
 
@@ -57,12 +58,12 @@ public class OrderChangeEntity {
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 
     public OrderChangeEntity() {}
     public OrderChangeEntity() {}
 }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/OrderTagStrategyEntity.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Entity
 @Entity
@@ -18,6 +19,6 @@ public class OrderTagStrategyEntity {
     private Integer priority;
     private Integer priority;
     private Integer disabled;
     private Integer disabled;
     private String memo;
     private String memo;
-    private Date createTime;
-    private Date updateTime;
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
 }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/OrgBranchEntity.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Entity
 @Entity
@@ -44,10 +45,10 @@ public class OrgBranchEntity {
     private String memo;
     private String memo;
 
 
 
 
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
 
 
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 
     public OrgBranchEntity() {}
     public OrgBranchEntity() {}
 }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/OrgClusterEntity.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Entity
 @Entity
@@ -36,10 +37,10 @@ public class OrgClusterEntity {
     private String updateUser;
     private String updateUser;
 
 
 
 
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
 
 
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 
     public OrgClusterEntity() {
     public OrgClusterEntity() {
     }
     }

project-order/src/main/java/com/dituhui/pea/order/entity/OrgGroupEntity.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Entity
 @Entity
@@ -80,12 +81,12 @@ public class OrgGroupEntity {
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
     /**
     /**
      * 更新时间
      * 更新时间
      */
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 
     public OrgGroupEntity() {}
     public OrgGroupEntity() {}
 }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/OrgTeamEngineerEntity.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Entity
 @Entity
@@ -42,12 +43,12 @@ public class OrgTeamEngineerEntity {
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
     /**
     /**
      * 更新时间
      * 更新时间
      */
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 
     public OrgTeamEngineerEntity() {
     public OrgTeamEngineerEntity() {
     }
     }

project-order/src/main/java/com/dituhui/pea/order/entity/OrgTeamEntity.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Entity
 @Entity
@@ -65,12 +66,12 @@ public class OrgTeamEntity {
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
     /**
     /**
      * 更新时间
      * 更新时间
      */
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 
     public OrgTeamEntity(){
     public OrgTeamEntity(){
 
 

project-order/src/main/java/com/dituhui/pea/order/entity/ProductCategoryEntity.java

@@ -7,6 +7,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GeneratedValue;
 import java.io.Serializable;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
@@ -73,12 +74,12 @@ public class ProductCategoryEntity {
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
     /**
     /**
      * 更新时间
      * 更新时间
      */
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 
     public ProductCategoryEntity() {
     public ProductCategoryEntity() {
     }
     }

project-order/src/main/java/com/dituhui/pea/order/entity/PubParamsEntity.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Date;
 
 
 @Entity
 @Entity
@@ -44,10 +45,10 @@ public class PubParamsEntity {
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
     /**
     /**
      * 更新时间
      * 更新时间
      */
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 }
 }