1111
Merge branch 'master' of https://github.com/zhjt19800720/dms-project

Conflicts:
	yijava-parent/yijava-dms/src/main/java/dms/yijava/dao/base/IbatisDaoSupport.java
Merge branch 'master' of https://github.com/zhjt19800720/dms-project.git

Conflicts:
	yijava-parent/yijava-dms/src/main/webapp/system/user/view.jsp