From 911297338aece1dedcddd5caaaf875c51c793aec Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 13 Aug 2021 12:05:02 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index 00c4211..73fe8c5 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -116,7 +116,6 @@
             }
         } else {
             queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
-            queryUse.setIsOver(Dictionary.FLAG_NO_N);
         }
 
         queryUse.setQueryKey(serviceVipProjDto.getQueryKey());

--
Gitblit v1.9.1