添加类
添加类
Merge branch 'master' of https://github.com/cqan/cbms.git

Conflicts:
	cbms-entity/src/main/java/com/cqan/system/User.java
Merge branch 'master' of https://github.com/cqan/cbms

Conflicts:
	cbms-entity/pom.xml