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

zhanghl

2025-05-16 c3c7756721b8b29585615f6d2c6cb6166f17c7cc

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

@@ -39,7 +39,7 @@
    @RequiresPermissions("gasMaterialUsage:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsGasMaterialUsage apsGasMaterialUsage) {
        startPage();
       /* startPage();*/
        List<ApsGasMaterialUsage> list = apsGasMaterialUsageService.selectApsGasMaterialUsageList(apsGasMaterialUsage);
        return getDataTable(list);
    }