v2.0改进
依赖字段检查
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/baihui/common/common/CommonController.java
	src/com/baihui/common/common/CommonDao.java
	src/com/baihui/common/common/CommonService.java
Merge remote-tracking branch 'origin/master'