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

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html

@@ -654,6 +654,18 @@
            var option;

            option = {
                tooltip: {
                    trigger: 'axis',
                    axisPointer: {
                        type: 'shadow'
                    }
                },
                grid: {
                    left: '3%',
                    right: '4%',
                    bottom: '3%',
                    containLabel: true
                },
                xAxis: {
                    type: 'category',
                    data: data.cityData