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

mrzhssss

2022-09-06 8745b76acfd45eadd720d7ce6d87c77e6e0682b9

 src/main/java/zy/cloud/wms/manager/controller/WorkController.java

@@ -77,7 +77,9 @@
    @RequestMapping("/stock/out/print")
    @ManagerAuth(memo = "拣货单打印")
    public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOutPrint(stockOutParam, getUserId(), getHostId());


        return workService.stockInPrint(stockOutParam, getUserId(), getHostId());
    }

    @RequestMapping("/stock/allot")