Merge branch 'hotfix_yuj_12101' into dev

src/main/java/com/uas/platform/b2c/common/account/model/UsageLog.java

@@ -33,7 +33,7 @@ public class UsageLog extends BufferedLogable implements Serializable {
 	private Long enUU;
 
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "log_useruu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "null",value = ConstraintMode.NO_CONSTRAINT))
+	@JoinColumn(name = "log_useruu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none",value = ConstraintMode.NO_CONSTRAINT))
 	private UserBaseInfo user;
 
 	@Column(name = "log_useruu")

src/main/java/com/uas/platform/b2c/prod/commodity/model/ProductMatchResult.java

@@ -36,7 +36,7 @@ public class ProductMatchResult implements Serializable {
 	 * 产品
 	 */
 	@ManyToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pr_prid", insertable = false, updatable = false)
+	@JoinColumn(name = "pr_prid", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
 	private Product product;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/commodity/model/V_ProductPerson.java

@@ -205,12 +205,6 @@ public class V_ProductPerson implements Serializable{
     @Column(name = "pr_matchsize")
     private Integer matchsize;
 
-    /**
-     * 匹配结果
-     */
-    @OneToMany(mappedBy = "product", cascade = { CascadeType.REFRESH }, fetch = FetchType.EAGER)
-    private Set<ProductMatchResult> matchresults;
-
     /**
      * 封装
      */
@@ -523,14 +517,6 @@ public class V_ProductPerson implements Serializable{
         this.matchsize = matchsize;
     }
 
-    public Set<ProductMatchResult> getMatchresults() {
-        return matchresults;
-    }
-
-    public void setMatchresults(Set<ProductMatchResult> matchresults) {
-        this.matchresults = matchresults;
-    }
-
     public String getEncapsulation() {
         return encapsulation;
     }

src/main/java/com/uas/platform/b2c/prod/commodity/model/V_ProductPrivate.java

@@ -202,12 +202,6 @@ public class V_ProductPrivate implements Serializable {
     @Column(name = "pr_matchsize")
     private Integer matchsize;
 
-    /**
-     * 匹配结果
-     */
-    @OneToMany(mappedBy = "product", cascade = { CascadeType.REFRESH }, fetch = FetchType.EAGER)
-    private Set<ProductMatchResult> matchresults;
-
     /**
      * 封装
      */
@@ -545,14 +539,6 @@ public class V_ProductPrivate implements Serializable {
         this.matchsize = matchsize;
     }
 
-    public Set<ProductMatchResult> getMatchresults() {
-        return matchresults;
-    }
-
-    public void setMatchresults(Set<ProductMatchResult> matchresults) {
-        this.matchresults = matchresults;
-    }
-
     public String getEncapsulation() {
         return encapsulation;
     }

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentGoods.java

@@ -112,14 +112,14 @@ public class ComponentGoods implements Serializable {
 	 * 器件的品牌
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cmp_brid", insertable = false, updatable = false)
+	@JoinColumn(name = "cmp_brid", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
 	private BrandInfo brand;
 
 	/**
 	 * 器件的分类
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cmp_kiid", insertable = false, updatable = false)
+	@JoinColumn(name = "cmp_kiid", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
 	private KindInfo kind;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/store/model/StoreIn.java

@@ -176,6 +176,7 @@ public class StoreIn implements Serializable {
 	 */
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, targetEntity = Qualification.class)
 	@JoinColumn(name = "qu_store_id")
+	@org.hibernate.annotations.ForeignKey(name = "none")
 	private Set<Qualification> qualifications = new HashSet<>();
 
 	/**

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchaseGoods.java

@@ -3,14 +3,7 @@ package com.uas.platform.b2c.trade.seek.model;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 /**
  * 求购与产品关联，是否有现货判断
@@ -44,7 +37,7 @@ public class SeekPurchaseGoods {
      * 求购详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_uu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_uu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private User user;
 
     /**
@@ -57,7 +50,7 @@ public class SeekPurchaseGoods {
      * 企业的详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_enUu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_enUu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private Enterprise enterprise;
 
     /**

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchaseOfferGoods.java

@@ -5,15 +5,7 @@ import com.uas.platform.b2c.common.account.model.User;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import javax.swing.plaf.basic.BasicInternalFrameTitlePane.SystemMenuBar;
 
 /**
@@ -88,7 +80,7 @@ public class SeekPurchaseOfferGoods {
      * 买家求购的详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_en_uu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_en_uu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private Enterprise enterprise;
 
     /**
@@ -113,7 +105,7 @@ public class SeekPurchaseOfferGoods {
      * 用户详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_uu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_uu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private User user;
 
     /**

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchasePushGoods.java

@@ -3,14 +3,7 @@ package com.uas.platform.b2c.trade.seek.model;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 /**
  * 推送给卖家的求购信息
@@ -38,7 +31,7 @@ public class SeekPurchasePushGoods {
      * 求购详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_uu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_uu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private User user;
 
     /**
@@ -51,7 +44,7 @@ public class SeekPurchasePushGoods {
      * 企业的详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_enUu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_enUu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private Enterprise enterprise;
 
     /**

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekSalesmanInfo.java

@@ -32,11 +32,11 @@ public class SeekSalesmanInfo {
     private Date publicDate;
 
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "id_useruu", insertable = false, updatable = false)
+    @JoinColumn(name = "id_useruu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private User user;
 
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "in_enuu", insertable = false, updatable = false)
+    @JoinColumn(name = "in_enuu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private Enterprise enterprise;
 
     @Column(name = "id_cmpcode")