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

Conflicts:
	WebContent/resources/js/global.js
	build/classes/com/crm/mapper/XmFieldMapper.class
	build/classes/com/crm/mapper/XmFieldMapper.xml
	src/com/crm/mapper/XmFieldMapper.java
	src/com/crm/mapper/XmFieldMapper.xml
Merge branch 'zhangjun' of git@github.com:App-coder/Optimize.git into junz

Conflicts:
	WebContent/resources/js/global.js
	build/classes/com/crm/mapper/XmFieldMapper.class
	build/classes/com/crm/mapper/XmFieldMapper.xml
	src/com/crm/mapper/XmFieldMapper.java
	src/com/crm/mapper/XmFieldMapper.xml

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