Merge branch 'feature-dingwf-0715' into develop

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

@@ -3,14 +3,14 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import java.io.Serializable;
 
 
 @Data
 @Data
 @Entity
 @Entity
-@Table(name="v_engineer_skill")
+@Table(name = "v_engineer_skill")
 public class EngineerSkillEntity {
 public class EngineerSkillEntity {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    @EmbeddedId
+    private PeaEntityId id;
     private String engineerCode;
     private String engineerCode;
     private String skillGroupCode;
     private String skillGroupCode;
     private String brand;
     private String brand;

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

+package com.dituhui.pea.order.entity;
+
+import javax.persistence.Embeddable;
+import java.io.Serializable;
+
+@Embeddable
+public class PeaEntityId implements Serializable {
+    // Add fields that uniquely identify each entity
+
+    // Override equals() and hashCode() methods if needed
+}