修理部分BUG
Merge branch 'master' of https://github.com/ycaihappy/mu

Conflicts:
	design/UI/PS璁捐/鍓嶅彴/鏂伴椈璇︽儏.jpg