Merge branch 'master' into dev

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

@@ -6,15 +6,7 @@ import com.uas.platform.core.logging.BufferedLogable;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.*;
 
 /**
@@ -41,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)
+	@JoinColumn(name = "log_useruu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "null",value = ConstraintMode.NO_CONSTRAINT))
 	private UserBaseInfo user;
 
 	@Column(name = "log_useruu")