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/core/pojo/BasePageQueryDto.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/core/pojo/BasePageQueryDto.java b/zq-erp/src/main/java/com/matrix/core/pojo/BasePageQueryDto.java
index 159f99d..a47fd5b 100644
--- a/zq-erp/src/main/java/com/matrix/core/pojo/BasePageQueryDto.java
+++ b/zq-erp/src/main/java/com/matrix/core/pojo/BasePageQueryDto.java
@@ -14,11 +14,11 @@
public class BasePageQueryDto {
- @NotNull(message = "参数不能为空")
+ @NotNull(message = "pageNum参数不能为空")
@ApiModelProperty(value = "第几页", example = "1")
private Integer pageNum;
- @NotNull(message = "参数不能为空")
+ @NotNull(message = "pageSize参数不能为空")
@ApiModelProperty(value ="数量", example = "10")
private Integer pageSize;
@@ -26,7 +26,7 @@
private String order;
@ApiModelProperty(value ="排序字段", example = "create_time")
- private String sortField;
+ private String sort;
@ApiModelProperty(value ="关键字")
private String keywords;
--
Gitblit v1.9.1