From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

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

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java
index ddf679b..93d9088 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java
@@ -122,8 +122,6 @@
 //            shoppingGoodsCategory.setShopId(user.getShopId());
 //        }
 //        shoppingGoodsCategory.setCompanyId(user.getCompanyId());
-        SysShopInfo zbShop = shopInfoDao.selectZbShop(getMe().getCompanyId());
-        shoppingGoodsCategory.setShopId(zbShop.getId());
         QueryUtil.setQueryLimitCom(shoppingGoodsCategory);
         return new AjaxResult(AjaxResult.STATUS_SUCCESS, goodsCategoryService.findByModel(shoppingGoodsCategory), 0);
     }

--
Gitblit v1.9.1