增加输入密码框
Merge branch 'master' of https://github.com/kiao295338444/cosmetology

Conflicts:

Cosmetology.xcodeproj/project.xcworkspace/xcuserdata/mijie.xcuserdatad/U
serInterfaceState.xcuserstate
	Cosmetology/src/Inc/global_define.h