From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
index 650f50a..020b110 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -127,7 +127,7 @@
SysProjUse item = sysBeauticianState.getProjUse();
// 若项目/套餐无效，则打印时，不显示余次
- if ("无效".equals(item.getStatus())) {
+ if (!"无效".equals(item.getStatus())) {
item.setRemainCount(item.getSurplusCount());
} else {
item.setRemainCount(null);
@@ -135,7 +135,7 @@
if (sysBeauticianState.getProjUse().getTaocanId() != null) {
SysProjUse sysProjUse = projUseService.findById(sysBeauticianState.getProjUse().getTaocanId());
- if ("无效".equals(sysProjUse.getStatus())) {
+ if (!"无效".equals(sysProjUse.getStatus())) {
item.setRemainCount(sysProjUse.getSurplusCount());
} else {
item.setRemainCount(null);
--
Gitblit v1.9.1