修改k线
git 测试
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/kaizone/songmaya/jsyl/widget/KView.java
KView修改