修改

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

@@ -2,25 +2,17 @@ package com.dituhui.pea.order.entity;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
 @Data
 @Data
 public class SkillGroup {
 public class SkillGroup {
 	private Integer id;
 	private Integer id;
-	private String skillCode;
-	private String brand;
-	private String type;
-	private String skill;
-	private Integer takeTime;
-	private Integer takeEngineer;
-	private Integer lowElectricianCert;
-	private Integer gasCert;
-	private Integer priority;
 	private String skillGroupCode;
 	private String skillGroupCode;
-	private String layerId;
-	private String typeCategory;
-	private String skillCategory;
+	private String skillGroup;
+	private String describe;
+	private String category;
 	private String memo;
 	private String memo;
 	private LocalDateTime createTime;
 	private LocalDateTime createTime;
-	private LocalDateTime updateTime;
+	private LocalDate updateTime;
 }
 }

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

@@ -2,17 +2,25 @@ package com.dituhui.pea.order.entity;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
 @Data
 @Data
 public class SkillInfo {
 public class SkillInfo {
 	private Integer id;
 	private Integer id;
+	private String skillCode;
+	private String brand;
+	private String type;
+	private String skill;
+	private Integer takeTime;
+	private Integer takeEngineer;
+	private Integer lowElectricianCert;
+	private Integer gasCert;
+	private Integer priority;
 	private String skillGroupCode;
 	private String skillGroupCode;
-	private String skillGroup;
-	private String describe;
-	private String category;
+	private String layerId;
+	private String typeCategory;
+	private String skillCategory;
 	private String memo;
 	private String memo;
 	private LocalDateTime createTime;
 	private LocalDateTime createTime;
-	private LocalDate updateTime;
+	private LocalDateTime updateTime;
 }
 }