CompanyVendor 改为 Vendor

common/src/main/java/com/ecep/contract/model/CompanyVendorApprovedItem.java

@@ -50,7 +50,7 @@ public class CompanyVendorApprovedItem implements IdentityEntity, Serializable,
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "VENDOR_ID", nullable = false)
     @ToString.Exclude
-    private CompanyVendor vendor;
+    private Vendor vendor;
 
     /**
      * 类型，历史的，可能会变更的，所以这样也要存

common/src/main/java/com/ecep/contract/model/CompanyVendorEntity.java

@@ -41,7 +41,7 @@ public class CompanyVendorEntity implements IdentityEntity, Serializable, Voable
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "COMPANY_VENDOR_ID")
     @ToString.Exclude
-    private CompanyVendor vendor;
+    private Vendor vendor;
 
     @Column(name = "NAME")
     private String name;

common/src/main/java/com/ecep/contract/model/CompanyVendorFile.java

@@ -41,7 +41,7 @@ public class CompanyVendorFile implements CompanyBasicFile<VendorFileType>, Seri
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "VENDOR_ID")
     @ToString.Exclude
-    private CompanyVendor vendor;
+    private Vendor vendor;
 
     @Column(name = "TYPE")
     @Enumerated(EnumType.STRING)

common/src/main/java/com/ecep/contract/model/Vendor.java

@@ -34,7 +34,7 @@ import lombok.ToString;
 @Entity
 @Table(name = "COMPANY_VENDOR", schema = "supplier_ms")
 @ToString
-public class CompanyVendor implements IdentityEntity, CompanyBasedEntity, Serializable, Voable<CompanyVendorVo> {
+public class Vendor implements IdentityEntity, CompanyBasedEntity, Serializable, Voable<CompanyVendorVo> {
     private static final long serialVersionUID = 1L;
     @Id
     @Column(name = "ID", nullable = false)
@@ -114,7 +114,7 @@ public class CompanyVendor implements IdentityEntity, CompanyBasedEntity, Serial
         if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
             return false;
         }
-        CompanyVendor that = (CompanyVendor) object;
+        Vendor that = (Vendor) object;
         return getId() != null && Objects.equals(getId(), that.getId());
     }
 

common/src/main/java/com/ecep/contract/vo/CloudRkVo.java

@@ -3,8 +3,10 @@ package com.ecep.contract.vo;
 import java.time.LocalDateTime;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class CloudRkVo extends CloudBasedVo implements CompanyBasedVo {
     private String cloudId;
     private Integer companyId;

common/src/main/java/com/ecep/contract/vo/CloudTycVo.java

@@ -3,8 +3,10 @@ package com.ecep.contract.vo;
 import java.time.LocalDateTime;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class CloudTycVo extends CloudBasedVo implements CompanyBasedVo {
     private Integer score;
     private LocalDateTime cloudLatest;

common/src/main/java/com/ecep/contract/vo/CloudYuVo.java

@@ -4,8 +4,10 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class CloudYuVo extends CloudBasedVo implements CompanyBasedVo  {
     private Integer companyId;
   

common/src/main/java/com/ecep/contract/vo/CompanyCustomerFileTypeLocalVo.java

@@ -5,8 +5,10 @@ import com.ecep.contract.model.BaseEnumEntity;
 import com.ecep.contract.model.IdentityEntity;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class CompanyCustomerFileTypeLocalVo extends BaseEnumEntity<CustomerFileType> implements IdentityEntity {
-    
+
 }

common/src/main/java/com/ecep/contract/vo/CompanyFileTypeLocalVo.java

@@ -5,8 +5,10 @@ import com.ecep.contract.model.BaseEnumEntity;
 import com.ecep.contract.model.IdentityEntity;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class CompanyFileTypeLocalVo extends BaseEnumEntity<CompanyFileType> implements IdentityEntity {
     private boolean active = false;
 }

common/src/main/java/com/ecep/contract/vo/ContractFileTypeLocalVo.java

@@ -4,8 +4,10 @@ import com.ecep.contract.model.BaseEnumEntity;
 import com.ecep.contract.model.IdentityEntity;
 import com.ecep.contract.ContractFileType;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class ContractFileTypeLocalVo extends BaseEnumEntity<ContractFileType> implements IdentityEntity {
     private String description;
     private String suggestFileName;

common/src/main/java/com/ecep/contract/vo/ProjectFileTypeLocalVo.java

@@ -5,8 +5,10 @@ import com.ecep.contract.model.BaseEnumEntity;
 import com.ecep.contract.model.IdentityEntity;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class ProjectFileTypeLocalVo extends BaseEnumEntity<ProjectFileType> implements IdentityEntity {
     private boolean active = false;
 }