Merge branch 'develop1.0' into zt_from_develop1.0

zt916916

2025-03-20 622e2b900a43fb6658e4d46cd376cd99e9633ab1

 zhitan-admin/src/main/java/com/zhitan/web/controller/gatewaysetting/GatewaySettingController.java

@@ -44,7 +44,6 @@
    @GetMapping("/list")
    public TableDataInfo list(GatewaySetting gatewaySetting,@RequestParam Long pageNum,@RequestParam Long pageSize)
    {
//        startPage();
        Page<GatewaySetting> list = gatewaySettingService.selectGatewaySettingPage(gatewaySetting,pageNum,pageSize);
        return getDataTable(list);
    }