From ad3f115b29e3c33b32bd38855bdc5b9f2de381b1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 18:31:56 +0800
Subject: [PATCH] Merge branch 'ty_fix' 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