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

wenwj

2025-04-12 32bcf3f12aef0de69f7cb83d3521b2452a01e50d

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

@@ -34,7 +34,7 @@
    @GetMapping("/list")
    public TableDataInfo list(ApsResourceGroupTemp apsResourceGroupTemp)
    {
        startPage();
        //startPage();
        List<ApsResourceGroupTemp> list = apsResourceGroupTempService.selectApsResourceGroupTempList(apsResourceGroupTemp);
        return getDataTable(list);
    }