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

无关风月

3 天以前 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

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

@@ -1273,6 +1273,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