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/vo/ServiceTcVo.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java index 256f635..67df2c9 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java +++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java @@ -140,7 +140,11 @@ } public String getStatus() { - return status; + if ("有效".equals(status)) { + return "1"; + } else { + return "2"; + } } public void setStatus(String status) { -- Gitblit v1.9.1