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

18516761980

2022-06-16 a0dc6d318064e45557bf2426a8f3064dbd23d93e

 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java

@@ -72,8 +72,8 @@
    }

    @Override
    public List<LocDetl> getStockStatisExcel() {
       return this.baseMapper.getStockStatisExcel();
    public List<LocDetl> getStockStatisExcel(LocDetl locDetl) {
       return this.baseMapper.getStockStatisExcel(locDetl);
    }

    /**