CompanyVendor 改为 Vendor
This commit is contained in:
@@ -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;
|
||||
|
||||
/**
|
||||
* 类型,历史的,可能会变更的,所以这样也要存
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user