4次提交
Merge branch 'master' of
https://github.com/SmallBoh/medical_treatment.git

Conflicts:
	test/src/net/yasite/test/ActivityPageSetting.java
四次提交。测试
Revert "四次提交。测试"

This reverts commit 33acce152117cc1ae3653bfabdd694f86b97c78c.
第5次提交。侧式