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

src/main/java/com/uas/platform/b2b/model/B2bCodeSet.java

@@ -75,7 +75,7 @@ public class B2bCodeSet implements Serializable{
 	@Column(name = "bc_prtypepreix")
 	private String prtypepreix;
 	
-	@Column(name = "bc_fromerp")
+	@Column(name = "bc_fromerp", nullable = false)
 	private String fromerp;
 	
 	@Column(name = "bc_fromplat")

src/main/java/com/uas/platform/b2b/model/Customer.java

@@ -36,7 +36,7 @@ public class Customer implements Serializable {
 	/**
 	 * 我的企业UU
 	 */
-	@Column(name = "cu_myenuu")
+	@Column(name = "cu_myenuu", nullable = false)
 	private Long myEnUU;
 
 	/**
@@ -50,14 +50,14 @@ public class Customer implements Serializable {
 	 * 客户企业UU
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cu_custenuu")
+	@JoinColumn(name = "cu_custenuu", nullable = false)
 	private Enterprise customerEnterprise;
 
 	/**
 	 * 客户联系人UU
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cu_custuseruu")
+	@JoinColumn(name = "cu_custuseruu", nullable = false)
 	@OtherUserUU
 	private UserBaseInfo customerUser;