java/zhihuishenqu.git

			@@ -1,9 +1,12 @@
			package com.panzhihua.common.model.vos.community.convenient;

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

			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.fasterxml.jackson.databind.annotation.JsonSerialize;
			import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
			import com.panzhihua.common.enums.MerchantBusinessPeriod;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			@@ -21,6 +24,7 @@
			public class ConvenientMerchantVO {

			@ApiModelProperty("商家ID")
			@JsonSerialize(using = ToStringSerializer.class)
			private Long id;

			@ApiModelProperty("商家名称")
			@@ -103,6 +107,24 @@
			@ApiModelProperty("该商家存有商品，最多返回两条")
			private List<ConvenientProductVO> productVOList;

			@ApiModelProperty("服务范围")
			private Integer serviceRange;

			@ApiModelProperty("手机号")
			private String mobilePhone;

			@ApiModelProperty("店铺销量")
			private Integer sale;

			@ApiModelProperty("店铺销售额")
			private BigDecimal saleVolume;

			@ApiModelProperty("详细地址")
			private String detailedAddress;

			@ApiModelProperty("商家评分")
			private BigDecimal score;

			public void setPeriod(String period) {
			this.period = MerchantBusinessPeriod.valueOf(period);
			}