Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj

hongjli

2025-05-14 c357f8844e03627d0c3bea4bf2058e7c69ff3518

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