1.合并盘点功能，解决代码合并冲突

2 years ago · 4585ed9dda
parent 3012af591f
commit 4585ed9dda
1 changed files with 2 additions and 0 deletions
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
@ -57,6 +57,8 @@ public class InvSubWarehouseController {
    private WarehouseUserService warehouseUserService;
    @Resource
    private InvSpaceService invSpaceService;
+    @Resource
+    private SystemParamConfigService systemParamConfigService;

    @AuthRuleAnnotation("")
    @GetMapping("spms/sub/inv/warehouse/filter")