合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

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

@@ -151,7 +151,7 @@
    }

    @RequestMapping(value = "/trayCode/print/auth")
    @ManagerAuth(memo = "托盘码打印")
    @ManagerAuth(memo = "货架码打印")
    public R print(@RequestParam String startNo,
                  @RequestParam Integer count,
                  @RequestParam Integer type){