Просмотр исходного кода

Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

hejq 7 лет назад
Родитель
Сommit
d367ecee8a

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/NoticeBody.java

@@ -8,7 +8,6 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
@@ -29,7 +28,7 @@ public class NoticeBody {
 	/**
 	 * 正文
 	 */
-	@Column(name = "nb_text")
+	@Column(name = "nb_text", length = 4000)
 	private String text;
 	/**
 	 * 图片

+ 1 - 1
src/main/java/com/uas/platform/b2b/model/PurchaseAcceptItem.java

@@ -71,7 +71,7 @@ public class PurchaseAcceptItem {
 	/**
 	 * 备注
 	 */
-	@Column(name = "pai_remark")
+	@Column(name = "pai_remark", length = 500)
 	private String remark;
 
 	/**

+ 3 - 3
src/main/java/com/uas/platform/b2b/model/PurchaseOrderChange.java

@@ -108,13 +108,13 @@ public class PurchaseOrderChange implements Serializable {
 	/**
 	 * 变更内容描述
 	 */
-	@Column(name = "pc_description")
+	@Column(name = "pc_description", length = 3000)
 	private String description;
 
 	/**
 	 * 备注
 	 */
-	@Column(name = "pc_remark")
+	@Column(name = "pc_remark", length = 500)
 	private String remark;
 
 	/**
@@ -150,7 +150,7 @@ public class PurchaseOrderChange implements Serializable {
 	/**
 	 * 回复备注
 	 */
-	@Column(name = "pc_replyremark")
+	@Column(name = "pc_replyremark", length = 500)
 	private String replyRemark;
 
 	/**

+ 1 - 1
src/main/java/com/uas/platform/b2b/model/PurchaseOrderChangeItem.java

@@ -139,7 +139,7 @@ public class PurchaseOrderChangeItem {
 	/**
 	 * 备注
 	 */
-	@Column(name = "pcd_remark")
+	@Column(name = "pcd_remark", length = 500)
 	private String remark;
 
 	/**

+ 3 - 3
src/main/java/com/uas/platform/b2b/model/PurchaseProofingApproval.java

@@ -162,7 +162,7 @@ public class PurchaseProofingApproval implements Serializable {
 	/**
 	 * 描述 - 研发认定
 	 */
-	@Column(name = "psa_prdremark")
+	@Column(name = "psa_prdremark", length = 1000)
 	private String prdremark;
 	/**
 	 * 附件 - 研发认定
@@ -193,7 +193,7 @@ public class PurchaseProofingApproval implements Serializable {
 	/**
 	 * 描述 - IQC认定
 	 */
-	@Column(name = "psa_padremark")
+	@Column(name = "psa_padremark", length = 1000)
 	private String padremark;
 	/**
 	 * 附件 - IQC认定
@@ -224,7 +224,7 @@ public class PurchaseProofingApproval implements Serializable {
 	/**
 	 * 描述 - 工程认定
 	 */
-	@Column(name = "psa_ppdremark")
+	@Column(name = "psa_ppdremark", length = 1000)
 	private String ppdremark;
 	/**
 	 * 附件 - 工程认定