Merge remote-tracking branch 'origin/dev' into test

Conflicts:
	src/main/java/com/ekexiu/portal/dao/DemandDao.java