Signed-off-by: junzhu052@gmail.com <junzhu052@gmail.com>
Signed-off-by: junzhu052@gmail.com <junzhu052@gmail.com>
Signed-off-by: junzhu052@gmail.com <junzhu052@gmail.com>
Signed-off-by: junzhu052@gmail.com <junzhu052@gmail.com>
Signed-off-by: junzhu052@gmail.com <junzhu052@gmail.com>
Signed-off-by: junzhu052@gmail.com <junzhu052@gmail.com>
Signed-off-by: junzhu052@gmail.com <junzhu052@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>
Signed-off-by: junzhu052@gmail.com <junzhu052@gmail.com>
Merge branch 'junz' of git@github.com:App-coder/Optimize.git into zhangjun

Conflicts:
	build/classes/com/crm/action/module/RendController.class
	build/classes/com/crm/action/module/util/ViewUtil.class
	build/classes/com/crm/action/settings/MultiwarehouseController.class
	build/classes/com/crm/action/settings/OrgsharingController.class
	build/classes/com/crm/action/settings/PortalConfigController.class
	build/classes/com/crm/action/settings/RecyclebinController.class
	build/classes/com/crm/action/settings/RoleController.class
	build/classes/com/crm/action/settings/UsersController.class
	build/classes/com/crm/bean/ui/ZNode.class
	build/classes/com/crm/interceptor/BaseInterceptor.class
	build/classes/com/crm/mapper/XmBlocksMapper.class
	build/classes/com/crm/mapper/XmBlocksMapper.xml
	build/classes/com/crm/mapper/XmCustomviewMapper.class
	build/classes/com/crm/mapper/XmCustomviewMapper.xml
	build/classes/com/crm/mapper/XmDefOrgFieldMapper.class
	build/classes/com/crm/mapper/XmDefOrgFieldMapper.xml
	build/classes/com/crm/mapper/XmFieldMapper.class
	build/classes/com/crm/mapper/XmFieldMapper.xml
	build/classes/com/crm/mapper/XmGroupsMapper.class
	build/classes/com/crm/mapper/XmGroupsMapper.xml
	build/classes/com/crm/mapper/XmHometemplatesMapper.class
	build/classes/com/crm/mapper/XmHometemplatesMapper.xml
	build/classes/com/crm/mapper/XmProfile2globalpermissionsMapper.class
	build/classes/com/crm/mapper/XmProfile2globalpermissionsMapper.xml
	build/classes/com/crm/mapper/XmProfile2standardpermissionsMapper.class
	build/classes/com/crm/mapper/XmProfile2standardpermissionsMapper.xml
	build/classes/com/crm/mapper/XmRole2profileMapper.xml
	build/classes/com/crm/mapper/XmTabMapper.class
	build/classes/com/crm/mapper/XmTabMapper.xml
	build/classes/com/crm/mapper/XmUsersMapper.class
	build/classes/com/crm/mapper/XmUsersMapper.xml
	build/classes/com/crm/model/XmField.class
	build/classes/com/crm/model/XmHometemplates.class
	build/classes/com/crm/model/XmTab.class
	build/classes/com/crm/model/XmUsers.class
	build/classes/com/crm/service/CustomviewService.class
	build/classes/com/crm/service/FieldService.class
	build/classes/com/crm/service/GroupsService.class
	build/classes/com/crm/service/RoleService.class
	build/classes/com/crm/service/TabService.class
	build/classes/com/crm/service/UsersService.class