Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

zc

2024-09-13 ec8120682339a7b9feb64748320781e99fa0cb77

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

@@ -33,6 +33,11 @@
    }

    @Override
    public Mat selectNewUpdateTime() {
        return this.baseMapper.selectNewUpdateTime();
    }

    @Override
    public Page<Mat> getMatTurnPage(Page<Mat> page){
        page.setRecords(baseMapper.getMatTurnPage(page.getCondition()));
//        page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));