From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsParamVo.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsParamVo.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsParamVo.java
index a4257a3..8bd9e7a 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsParamVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsParamVo.java
@@ -20,20 +20,20 @@
* 开始时间
*/
@NotBlank(message = "参数错误")
- @ApiModelProperty(value = "开始时间", example = "2020-01")
+ @ApiModelProperty(value = "开始时间", example = "2020-12-01")
private String beginTime;
/**
*结束时间
*/
@NotBlank(message = "参数错误")
- @ApiModelProperty(value = "结束时间", example = "2020-12")
+ @ApiModelProperty(value = "结束时间", example = "2020-12-31")
private String endTime;
/**
*统计单位
*/
@NotBlank(message = "参数错误")
- @ApiModelProperty(value = "统计单位", example = "月")
+ @ApiModelProperty(value = "统计单位", example = "日")
private String statisticsUnit;
/**
@@ -47,7 +47,7 @@
@ApiModelProperty(value = "门店ID, 不传默认统计整个公司")
private Long shopId;
- @ApiModelProperty(value = "类型 1-营业收入 2-现金收入 3-余额划扣 4-本金消耗 5-赠送消耗 6-现金退款 7-卡项退款 8-欠款")
+ @ApiModelProperty(value = "类型 1-营业收入 2-现金收入 3-余额划扣 4-本金消耗 5-赠送消耗 6-现金退款 7-卡项退款 8-欠款", example = "1")
private String type;
public String getType() {
--
Gitblit v1.9.1