Merge remote-tracking branch 'origin/master'

Junjie

2024-03-11 17150b54d35c3ab02b2082ac4e9fc34858d43d77

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/DocTypeController.java

@@ -25,8 +25,8 @@

    @RequestMapping(value = "/docType/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(docTypeService.getById(String.valueOf(id)));
    public R get(@PathVariable("id") Long id) {
        return R.ok(docTypeService.getById(id));
    }

    @RequestMapping(value = "/docType/page/auth")