core

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueOrderinfo.java

@@ -73,7 +73,7 @@ public class IssueOrderinfo extends AbstractStringPropertyUUIDEntity {
     @Column(name = "PRODUCT_AGREE_NO")
     private String productAgreeNo;//产品协议编号
     @Column(name = "PRODUCT_TYPES")
-    private Integer productTypes;//产品类型 0：自营产品、1：非自营产品
+    private Integer productTypes;//产品类型 1：自营产品、0：非自营产品
     @Column(name = "PROMOTION_MODES")
     private Integer promotionModes;//推广模式(1--线上, 2---线下,3：线上和线下)
     @Column(name = "EQUITY_ID")

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueProduct.java

@@ -64,8 +64,9 @@ public class IssueProduct extends StringPropertyUUIDEntity {
 	@Column(name = "WARRANTY_PERIOD")
 	private Integer warrantyPeriod;//质保期 (单位-年）
 	@Column(name = "PRODUCT_TYPE")
-	private Integer productType;//产品类型 0：自营产品、1：非自营产品
+	private Integer productType;//产品类型 1：自营产品、0：非自营产品
 	@Column(name = "DEVICE_TYPE")
+	@Enumerated(EnumType.STRING)
 	private SecretKeyType deviceType;//设备类型
 	@Column(name = "CENTER_NO")
 	private String centerNo;//部中心编号
@@ -110,11 +111,11 @@ public class IssueProduct extends StringPropertyUUIDEntity {
 	@Size(max = 255)
 	@Column(name = "QD_SIGN_APPID")
 	private String qdSignAppid;//渠道签约小程序appId
-	@Column(name = "NEED_NOTICE_CHANNEL")
-	private Integer needNoticeChannel;//注销是否通知渠道
-	@Size(max = 1000)
-	@Column(name = "CHANNEL_URL")
-	private String channelUrl;//通知渠道接口地址
+//	@Column(name = "NEED_NOTICE_CHANNEL")
+//	private Integer needNoticeChannel;//注销是否通知渠道
+//	@Size(max = 1000)
+//	@Column(name = "CHANNEL_URL")
+//	private String channelUrl;//通知渠道接口地址
 	@Size(max = 32)
 	@Column(name = "OPERATE_USER_ID")
 	private String operateUserId;//操作人Openid
@@ -129,8 +130,7 @@ public class IssueProduct extends StringPropertyUUIDEntity {
 	@Size(max = 255)
 	@Column(name = "EXAMINE_DES")
 	private String examineDes;//审核原因
-	@NotBlank
-	@Size(max = 20)
+	@NotNull
 	@Column(name = "STATUS")
 	private EnableStatus status = EnableStatus.DISABLE;//状态
 	@Size(max = 500)

gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwAlarmConfig.java

@@ -41,7 +41,7 @@ public class MsgwAlarmConfig extends StringPropertyUUIDEntity {
 	@Column(name = "MESSAGE_TYPE")
 	@Enumerated(EnumType.STRING)
 	private MessageType messageType;//发送客户端类型
-	@NotBlank
+	@NotNull
 	@Size(max = 100)
 	@Column(name = "STATUS")
 	@Enumerated(EnumType.STRING)

gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwClient.java

@@ -39,7 +39,7 @@ public class MsgwClient extends StringPropertyUUIDEntity {
 	@Column(name = "MESSAGE_TYPE")
 	@Enumerated(EnumType.STRING)
 	private MessageType messageType;//客户端id
-	@NotBlank
+	@NotNull
 	@Column(name = "STATUS")
 	@Enumerated(EnumType.STRING)
 	private EnableStatus status;//客户端状态