Merge branch 'master' of https://github.com/ljh0925/cixuanhuanzhu
Merge branch 'master' of https://github.com/ljh0925/cixuanhuanzhu

Conflicts:
	选矿设备VER0.2.1/cixuan.vpwhist