From 9f3558c406bee2ec680ded8dda6d69b440116a35 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 01 Mar 2021 11:45:17 +0800
Subject: [PATCH] Merge branch 'api' of http://120.27.238.55:7000/r/beauty-erp into api

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java
index 2b06093..6023fa5 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java
@@ -161,9 +161,6 @@
         if (CollectionUtils.isEmpty(shopProducts)) {
             shopProduct.setDelFlag(AppConstance.DATA_USEABLE);
             shopProduct.setStatus(AppConstance.IS_PUTAWAY);
-            if(shopProduct.getIsService()==null){
-                shopProduct.setIsService(2);
-            }
             shopProduct.setCompanyId(HostInterceptor.getCompanyId());
             shopProducts = shopProductDao.selectByModelWx(shopProduct);
         }

--
Gitblit v1.9.1