Merge branch 'develop1.0' into develop_alioo

ali

2025-02-24 c89dd113d8573a10a9e666785b8be5d4c3ef511d

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