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

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

@@ -130,6 +130,12 @@ public class InvitationRecord implements Serializable {
 	@Transient
 	private Long productNum;
 
+	/**
+	 * 如果企业注册，展示注册时间
+	 */
+	@Transient
+	private Date registerDate;
+
 	public Long getId() {
 		return id;
 	}
@@ -273,4 +279,12 @@ public class InvitationRecord implements Serializable {
 	public void setProductNum(Long productNum) {
 		this.productNum = productNum;
 	}
+
+    public Date getRegisterDate() {
+        return registerDate;
+    }
+
+    public void setRegisterDate(Date registerDate) {
+        this.registerDate = registerDate;
+    }
 }

src/main/java/com/uas/platform/b2b/service/impl/InvitationRecordServiceImpl.java

@@ -209,6 +209,7 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
                         record.setSamecount(enters.size());
                         record.setVenduu(enters.get(0).getUu());
                         record.setProductNum(productDao.countByEnUU(enters.get(0).getUu()));
+                        record.setRegisterDate(enters.get(0).getEnDate());
                     } else {
                         record.setActive(Constant.NO);
                         record.setSamecount(enters.size());