Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

zyx

2023-11-07 b801ccf0a01277b0796ee6f822346836e33de148

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

@@ -94,7 +94,7 @@
    }

    public Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page) {
        page.setRecords(baseMapper.getStockStatis(page.getCondition()));
        page.setRecords(baseMapper.getStockStatis1(page.getCondition()));
        page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
        return page;
    }