Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-09 faecccbe46a1f85b5d9b18fce12e02764faba78e

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

@@ -73,8 +73,8 @@
            param.remove("supplier");
        }
        /* 生产单号为空，删除生产单号warehouse */
        if (Cools.isEmpty(param.get("warehouse"))) {
            param.remove("warehouse");
        if (Cools.isEmpty(param.get("mnemonic"))) {
            param.remove("mnemonic");
        }
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
    }