java/zhihuishenqu.git

			@@ -2,6 +2,7 @@

			import java.math.BigDecimal;
			import java.util.Date;
			import java.util.List;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import org.springframework.format.annotation.DateTimeFormat;
			@@ -131,4 +132,35 @@

			@ApiModelProperty(value = "商户名称")
			private String storeName;

			@ApiModelProperty(value = "商户规格id")
			private Long specsId;

			@ApiModelProperty(value = "商户规格名称")
			private String specsName;

			@ApiModelProperty(value = "活动已卖出数量")
			private Integer commoditySaleNum;

			@ApiModelProperty(value = "是否可以开团（1.是 2.否）")
			private Integer isOpen = 1;

			@ApiModelProperty(value = "团队id")
			private Long teamId;

			@ApiModelProperty(value = "拼团结束时间")
			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date teamEndTime;

			@ApiModelProperty(value = "是否可以砍价（1.是 2.否）")
			private Integer isBargain = 1;

			@ApiModelProperty(value = "砍价记录id")
			private Long bargainId;

			@ApiModelProperty(value = "砍价结束时间")
			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date bargainEndTime;
			}