Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-16 8b52cb78c70877c9d8689bfcdb49461995cf939a

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

@@ -63,6 +63,7 @@
    @ManagerAuth
    public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
//                          @RequestParam(required = false)String condition,
                          @RequestParam Map<String, Object> param){
        if (!Cools.isEmpty(param.get("modi_time"))){
            String val = String.valueOf(param.get("modi_time"));