测试图表
Merge branch 'develop' into feature_chart
==
Merge branch 'develop' into feature_chart
==
Merge branch 'feature_chart' of https://github.com/wenyangw/lnyswz.git into feature_chart
Merge branch 'develop' into feature_chart

Conflicts:
	resources/config.properties
Merge branch 'develop' into feature_chart
Merge branch 'develop' into feature_chart
==
Merge branch 'develop' into feature_chart
销售统计分析完成