Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

2 天以前 d5eb955933d4c7dc1f102d8a688f7447b5a674fd

 src/main/java/com/zy/asrs/controller/WrkMastLogController.java

@@ -57,7 +57,7 @@
    }

    @RequestMapping(value = "/inventoryFlow/list/auth")
    @ManagerAuth(memo = "库存移动流水记录")
//    @ManagerAuth(memo = "库存移动流水记录")
    public R inventoryFlowList(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,