添加用户功能，未完成
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/hello/core/db/AbstractBaseDAO.java
	src/main/java/com/hello/core/model/impl/ArticleModel.java
用户功能尚未完成