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

zhanghl

2025-04-21 749fc95e71337add490b88820bd8f090ae6b4481

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

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