Merge remote-tracking branch 'refs/remotes/origin/stasrs' into stasrs

Junjie

2023-03-14 163bdd3a71de83b9e36340be3fe6380b6758e4fd

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

@@ -335,8 +335,8 @@

    @Override
    @Transactional
    public List<StockVo> queryStock() {
        return locDetlService.queryStockTotal();
    public List<StockVo> queryStock(StockVo stockVo) {
        return locDetlService.queryStockTotal(stockVo);
    }

    @Override