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

hongjli

2025-05-23 48f5220bc5eb826402f43e440dc34867368ff17c

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsMaterialManagementController.java

@@ -42,7 +42,7 @@
    @GetMapping("/list")
    public TableDataInfo list(ApsMaterialManagement apsMaterialManagement)
    {
//        startPage();
        startPage();
        List<ApsMaterialManagement> list = apsMaterialManagementService.selectApsMaterialManagementList(apsMaterialManagement);
        return getDataTable(list);
    }