From 30f3c72b0b25ab0aaeb9dd5d9918de3b123ce5e6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 08 Apr 2021 16:34:58 +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/hive/action/ProjServiceController.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 00b210a..0924ecd 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
@@ -489,8 +489,7 @@
@RequestMapping(value = "/addService")
public @ResponseBody
AjaxResult servicceAdd(@RequestBody SysProjServices sysProjServices) {
- SysVipInfo vipInfo = getCurrentVioInfo();
- sysProjServices.setVipId(vipInfo.getId());
+
if (CollectionUtils.isEmpty(sysProjServices.getServiceItems())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "没有选中可消耗的项目");
@@ -520,8 +519,8 @@
@RequestMapping(value = "/addServiceForForm")
public @ResponseBody
AjaxResult servicceAddForForm(SysProjServices sysProjServices) {
- SysVipInfo vipInfo = getCurrentVioInfo();
- sysProjServices.setVipId(vipInfo.getId());
+
+
if (CollectionUtils.isEmpty(sysProjServices.getServiceItems())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "没有选中可消耗的项目");
--
Gitblit v1.9.1