~jiangyouyao/beauty-erp.git

			@@ -3,6 +3,8 @@
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;

			import javax.validation.constraints.NotBlank;

			/**
			* 统计查询条件
			* @author jyy
			@@ -17,18 +19,21 @@
			/**
			* 开始时间
			*/
			@ApiModelProperty(value = "开始时间", example = "2020-01")
			@NotBlank(message = "参数错误")
			@ApiModelProperty(value = "开始时间", example = "2020-12-01")
			private String beginTime;

			/**
			*结束时间
			*/
			@ApiModelProperty(value = "结束时间", example = "2020-12")
			@NotBlank(message = "参数错误")
			@ApiModelProperty(value = "结束时间", example = "2020-12-31")
			private String endTime;
			/**
			*统计单位
			*/
			@ApiModelProperty(value = "统计单位", example = "月")
			@NotBlank(message = "参数错误")
			@ApiModelProperty(value = "统计单位", example = "日")
			private String statisticsUnit;

			/**
			@@ -42,6 +47,17 @@
			@ApiModelProperty(value = "门店ID, 不传默认统计整个公司")
			private Long shopId;

			@ApiModelProperty(value = "类型 1-营业收入 2-现金收入 3-余额划扣 4-本金消耗 5-赠送消耗 6-现金退款 7-卡项退款 8-欠款", example = "1")
			private String type;

			public String getType() {
			return type;
			}

			public void setType(String type) {
			this.type = type;
			}

			public String getBeginTime() {
			return beginTime;
			}