Merge branch 'master' of https://github.com/GanhuiyouTeam/GanHuiYou

Conflicts:

GanHuiYou.xcworkspace/xcuserdata/cq.xcuserdatad/UserInterfaceState.xcuse
rstate
update