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

zjj

2024-11-05 af11b74ea0ec26ed8765244b3f51fad5aca9142a

 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()));