From 3e85a137adb035e4808e95edf7017f7f204900d9 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 22 May 2021 09:32:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
index b22fdc1..f0c6d88 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -198,14 +198,14 @@
achieveNew.setShoppingGoodsId(projUse.getProjId());
if (flag) {
- if (!achieveId.equals(beauticianState.getStaffId())) {
+// if (!achieveId.equals(beauticianState.getStaffId())) {
AchieveNew saleMan = new AchieveNew();
BeanUtils.copyProperties(achieveNew, saleMan);
saleMan.setBeaultId(achieveId);
saleAchieveNumOfPeople(saleMan);
achieveNewList.add(saleMan);
- }
+// }
}
List<AchieveNew> beautyList = achieveNewDao.selectBeautyManAchieveList(beauticianState.getStaffId(), projServices.getVipId(), new Date());
--
Gitblit v1.9.1