Commit 319d0e2f authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents e003a2a2 568ba070
......@@ -51,15 +51,13 @@ public class TGzEmpInfo extends BaseEntity {
@ExcelProperty("主键")
@Schema(description = "主键")
private String id;
/**
* 关联瓜子offerID
*/
@ExcelAttribute(name = "关联瓜子offerID", isNotEmpty = true, errorInfo = "关联瓜子offerID不能为空", maxLength = 32)
@NotBlank(message = "关联瓜子offerID不能为空")
@Length(max = 32, message = "关联瓜子offerID不能超过32个字符")
@ExcelProperty("关联瓜子offerID")
@Schema(description = "关联瓜子offerID")
private String offerId;
private Integer offerId;
/**
* 档案推送状态(0:待推送;1:已推送)
*/
......
......@@ -48,10 +48,11 @@ public class TGzOfferInfo extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@TableId(type = IdType.AUTO)
@ExcelProperty("主键")
@Schema(description = "主键")
private String id;
private Integer id;
/**
* 流程ID(瓜子推过来的主键)
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment