半截工作

Merge branch 'I2' of git@github.com:liubida/bullx.git into I2

Conflicts:
	bullx-core/src/main/java/com/pigandbull/I2/system/model/Draw.java
	bullx-web/src/main/java/com/pigandbull/I2/ChartController.java
	bullx-web/src/main/webapp/page/data/bianyaqi_one.js
	bullx-web/src/main/webapp/page/data/bianyaqi_tiexin.js
	bullx-web/src/main/webapp/page/data/bianyaqi_yousepu.js