Signed-off-by: mxzjzj <mxzjzj@gmail.com>
Merge branch 'junz' of git@github.com:App-coder/Optimize.git into zhangjun

Conflicts:
	src/com/crm/mapper/XmEntitynameMapper.java

Signed-off-by: mxzjzj <mxzjzj@gmail.com>
Merge branch 'zhangjun' of git@github.com:App-coder/Optimize.git into junz
hi

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