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/app/dto/CreateOderItemDto.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java
index 9ff080f..7dc234e 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java
@@ -54,7 +54,11 @@
     }
 
     public String getIsFree() {
-        return isFree;
+        if ("1".equals(isFree)) {
+            return "是";
+        } else {
+            return "否";
+        }
     }
 
     public void setIsFree(String isFree) {

--
Gitblit v1.9.1