合并分支代码

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

@@ -21,8 +21,7 @@ import java.util.*;
 public class PurchaseInquiryItemTemp {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$inquiryitems_gen")
-	@SequenceGenerator(name = "purc$inquiryitems_gen", sequenceName = "purc$inquiryitems_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "id_id")
 	private Long id;
 

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

@@ -29,8 +29,7 @@ public class PurchaseInquiryTemp implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$inquiry_gen")
-	@SequenceGenerator(name = "purc$inquiry_gen", sequenceName = "purc$inquiry_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "in_id")
 	private Long id;
 

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

@@ -10,30 +10,9 @@ import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 import org.springframework.util.CollectionUtils;
 
-import javax.persistence.Cacheable;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 import com.uas.sso.entity.UserView;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-import org.springframework.util.CollectionUtils;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.model.Constant;
 import org.springframework.util.StringUtils;
 import java.io.Serializable;
 import java.util.HashSet;
@@ -51,20 +30,6 @@ public class User implements Serializable {
 	 */
 	private static final long serialVersionUID = 1L;
 
-	public User(UserView userView) {
-		this.setUserUU(userView.getUserUU());
-		this.setUserName(userView.getVipName());
-		this.setUserTel(userView.getMobile());
-		this.setUserEmail(userView.getEmail());
-		this.setUserPwd(userView.getPassword());
-		this.setUserIMId(StringUtils.isEmpty(userView.getImId()) ? null : Long.valueOf(userView.getImId()));
-		this.setUserSex(userView.getSex());
-	}
-
-	public User(Long userUU) {
-		this.userUU = userUU;
-	}
-
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "user_uu")
@@ -352,6 +317,23 @@ public class User implements Serializable {
 		this.transfer = transfer;
 	}
 
+	public User(UserView userView) {
+		this.setUserUU(userView.getUserUU());
+		this.setUserName(userView.getVipName());
+		this.setUserTel(userView.getMobile());
+		this.setUserEmail(userView.getEmail());
+		this.setUserPwd(userView.getPassword());
+		this.setUserIMId(StringUtils.isEmpty(userView.getImId()) ? null : Long.valueOf(userView.getImId()));
+		this.setUserSex(userView.getSex());
+	}
+
+	public User(Long userUU) {
+		this.userUU = userUU;
+	}
+
+	public User() {
+	}
+
 	/**
 	 * 获取用户所属企业UU号
 	 * 

src/main/java/com/uas/platform/b2b/v2/controller/InviteRecordController.java

@@ -24,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;