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/fenxiao/vo/LoadSetOrderListDtoVo.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadSetOrderListDtoVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadSetOrderListDtoVo.java
index c1d410d..b769ec7 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadSetOrderListDtoVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadSetOrderListDtoVo.java
@@ -1,13 +1,12 @@
 package com.matrix.system.fenxiao.vo;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @ApiModel(value = "LoadSetOrderListDtoVo", description = "返回类")
@@ -27,10 +26,10 @@
 	@ApiModelProperty(value = "结算时间")
 	private Date setTime;
 	@ApiModelProperty(value = "结算人")
-	private Integer setMan;
+	private String setMan;
 	@ApiModelProperty(value = "结算方式")
 	private BigDecimal settlementWay;
 	@ApiModelProperty(value = "备注")
-	private Integer remark;
+	private String remark;
 
 }

--
Gitblit v1.9.1