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

zjj

2023-06-03 b0c1e111b8591404ec3ed384a8119db67685f672

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

@@ -86,7 +86,7 @@
                param.remove("modi_time");
            }
        }
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class),"2"));
    }

    @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 接口问题
@@ -309,7 +309,7 @@
            }
        }

        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class),"1"));
    }