Merge branch 'junz' of git@github.com:App-coder/Optimize.git into zhangjun

Conflicts:
	build/classes/applicationContext-Mapper.xml
	build/classes/com/crm/mapper/XmUsers2groupMapper.class
	build/classes/com/crm/mapper/XmUsers2groupMapper.xml
	work/org/apache/jsp/settings/users/showedit_jsp.class
	work/org/apache/jsp/settings/users/showedit_jsp.java

Signed-off-by: mxzjzj <mxzjzj@gmail.com>