java/qijisheng.git

			@@ -9,6 +9,7 @@

			import java.io.Serializable;
			import java.math.BigDecimal;
			import java.time.LocalDate;
			import java.time.LocalDateTime;
			import java.util.List;

			@@ -34,7 +35,6 @@

			@ApiModelProperty(value = "删除标志（0=否，1=是）")
			@TableField("del_flag")
			@TableLogic
			private Integer delFlag;

			@ApiModelProperty(value = "添加时间")
			@@ -83,11 +83,11 @@

			@ApiModelProperty(value = "有效期开始时间")
			@TableField("period_start_time")
			private LocalDateTime periodStartTime;
			private LocalDate periodStartTime;

			@ApiModelProperty(value = "有效期结束时间")
			@TableField("period_end_time")
			private LocalDateTime periodEndTime;
			private LocalDate periodEndTime;

			@ApiModelProperty(value = "领取后x天有效")
			@TableField("period_days")
			@@ -116,10 +116,13 @@
			@ApiModelProperty(value = "可领取对应的ids，用find_in_set查询")
			@TableField("person_ids")
			private String personIds;


			@ApiModelProperty(value = "商品卷对应的商品名称")
			@TableField(exist = false)
			private List<String> goodNames;

			@ApiModelProperty(value = "其他商品名称")
			private String goodsNameJson;


			}