From 4bc4270eb46bd06db2013b234aab3e54e1150e2a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 24 Apr 2022 23:56:35 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
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