From 522f32b832e47a1e0cb01b0b495d16ada34366a6 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 16 Jan 2021 15:00:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' 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