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

Conflicts:
	build/classes/applicationContext-Cache.xml
	build/classes/com/crm/action/util/ActionUtil.class
	build/classes/com/crm/bean/Message.class
	build/classes/com/crm/interceptor/cache/MethodCacheInterceptor.class
	build/classes/com/crm/mapper/XmEntitynameMapper.class
	build/classes/com/crm/mapper/XmEntitynameMapper.xml
	build/classes/com/crm/mapper/XmFilesMapper.class
	build/classes/com/crm/mapper/XmFilesMapper.xml
	build/classes/com/crm/mapper/XmImportMapsMapper.class
	build/classes/com/crm/mapper/XmImportMapsMapper.xml
	build/classes/com/crm/mapper/XmProfile2fieldMapper.class
	build/classes/com/crm/mapper/XmProfile2fieldMapper.xml
	build/classes/com/crm/mapper/XmProfile2tabMapper.class
	build/classes/com/crm/mapper/XmProfile2tabMapper.xml
	build/classes/com/crm/mapper/XmStep2usersMapper.class
	build/classes/com/crm/mapper/XmStep2usersMapper.xml
	build/classes/com/crm/mapper/XmTrackerMapper.class
	build/classes/com/crm/mapper/XmTrackerMapper.xml
	build/classes/com/crm/mapper/XmUser2roleMapper.class
	build/classes/com/crm/mapper/XmUser2roleMapper.xml
	build/classes/com/crm/mapper/XmUsersLastImportMapper.class
	build/classes/com/crm/mapper/XmUsersLastImportMapper.xml
	build/classes/com/crm/service/EntitynameService.class
	build/classes/com/crm/service/Role2profileService.class
	src/com/crm/mapper/XmEntitynameMapper.java
	src/com/crm/mapper/XmEntitynameMapper.xml
	work/org/apache/jsp/module/home/index_jsp.class
	work/org/apache/jsp/module/home/index_jsp.java
	work/org/apache/jsp/module/rend/single_jsp.class
	work/org/apache/jsp/module/rend/single_jsp.java
	work/org/apache/jsp/settings/controlpanel/index_jsp.class
	work/org/apache/jsp/settings/controlpanel/index_jsp.java
	work/org/apache/jsp/settings/groups/index_jsp.class
	work/org/apache/jsp/settings/groups/index_jsp.java
	work/org/apache/jsp/settings/role/index_jsp.class
	work/org/apache/jsp/settings/role/index_jsp.java
	work/org/apache/jsp/settings/role/showedit_jsp.class
	work/org/apache/jsp/settings/role/showedit_jsp.java
	work/org/apache/jsp/settings/users/index_jsp.class
	work/org/apache/jsp/settings/users/index_jsp.java

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

Conflicts:
	build/classes/applicationContext-Cache.xml
	build/classes/com/crm/action/util/ActionUtil.class
	build/classes/com/crm/bean/Message.class
	build/classes/com/crm/interceptor/cache/MethodCacheInterceptor.class
	build/classes/com/crm/mapper/XmEntitynameMapper.class
	build/classes/com/crm/mapper/XmEntitynameMapper.xml
	build/classes/com/crm/mapper/XmFilesMapper.class
	build/classes/com/crm/mapper/XmFilesMapper.xml
	build/classes/com/crm/mapper/XmImportMapsMapper.class
	build/classes/com/crm/mapper/XmImportMapsMapper.xml
	build/classes/com/crm/mapper/XmProfile2fieldMapper.class
	build/classes/com/crm/mapper/XmProfile2fieldMapper.xml
	build/classes/com/crm/mapper/XmProfile2tabMapper.class
	build/classes/com/crm/mapper/XmProfile2tabMapper.xml
	build/classes/com/crm/mapper/XmStep2usersMapper.class
	build/classes/com/crm/mapper/XmStep2usersMapper.xml
	build/classes/com/crm/mapper/XmTrackerMapper.class
	build/classes/com/crm/mapper/XmTrackerMapper.xml
	build/classes/com/crm/mapper/XmUser2roleMapper.class
	build/classes/com/crm/mapper/XmUser2roleMapper.xml
	build/classes/com/crm/mapper/XmUsersLastImportMapper.class
	build/classes/com/crm/mapper/XmUsersLastImportMapper.xml
	build/classes/com/crm/service/EntitynameService.class
	build/classes/com/crm/service/Role2profileService.class
	src/com/crm/mapper/XmEntitynameMapper.java
	src/com/crm/mapper/XmEntitynameMapper.xml
	work/org/apache/jsp/module/home/index_jsp.class
	work/org/apache/jsp/module/home/index_jsp.java
	work/org/apache/jsp/module/rend/single_jsp.class
	work/org/apache/jsp/module/rend/single_jsp.java
	work/org/apache/jsp/settings/controlpanel/index_jsp.class
	work/org/apache/jsp/settings/controlpanel/index_jsp.java
	work/org/apache/jsp/settings/groups/index_jsp.class
	work/org/apache/jsp/settings/groups/index_jsp.java
	work/org/apache/jsp/settings/role/index_jsp.class
	work/org/apache/jsp/settings/role/index_jsp.java
	work/org/apache/jsp/settings/role/showedit_jsp.class
	work/org/apache/jsp/settings/role/showedit_jsp.java
	work/org/apache/jsp/settings/users/index_jsp.class
	work/org/apache/jsp/settings/users/index_jsp.java

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

Conflicts:
	build/classes/applicationContext-Cache.xml
	build/classes/com/crm/action/module/util/ViewUtil.class
	build/classes/com/crm/action/other/CustomviewController.class
	build/classes/com/crm/action/settings/PortalConfigController.class
	build/classes/com/crm/action/settings/RoleController.class
	build/classes/com/crm/action/util/ActionUtil.class
	build/classes/com/crm/action/util/CustomviewUtil.class
	build/classes/com/crm/bean/Message.class
	build/classes/com/crm/interceptor/cache/MethodCacheInterceptor.class
	build/classes/com/crm/mapper/XmCustomviewMapper.xml
	build/classes/com/crm/mapper/XmEntitynameMapper.class
	build/classes/com/crm/mapper/XmEntitynameMapper.xml
	build/classes/com/crm/mapper/XmFieldMapper.class
	build/classes/com/crm/mapper/XmFieldMapper.xml
	build/classes/com/crm/mapper/XmFilesMapper.class
	build/classes/com/crm/mapper/XmFilesMapper.xml
	build/classes/com/crm/mapper/XmHometemplatesMapper.class
	build/classes/com/crm/mapper/XmHometemplatesMapper.xml
	build/classes/com/crm/mapper/XmImportMapsMapper.class
	build/classes/com/crm/mapper/XmImportMapsMapper.xml
	build/classes/com/crm/mapper/XmProfile2fieldMapper.class
	build/classes/com/crm/mapper/XmProfile2fieldMapper.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/XmProfile2tabMapper.class
	build/classes/com/crm/mapper/XmProfile2tabMapper.xml
	build/classes/com/crm/mapper/XmStep2usersMapper.class
	build/classes/com/crm/mapper/XmStep2usersMapper.xml
	build/classes/com/crm/mapper/XmTrackerMapper.class
	build/classes/com/crm/mapper/XmTrackerMapper.xml
	build/classes/com/crm/mapper/XmUser2roleMapper.class
	build/classes/com/crm/mapper/XmUser2roleMapper.xml
	build/classes/com/crm/mapper/XmUsersLastImportMapper.class
	build/classes/com/crm/mapper/XmUsersLastImportMapper.xml
	build/classes/com/crm/model/XmField.class
	build/classes/com/crm/model/XmHometemplates.class
	build/classes/com/crm/service/CustomviewService.class
	build/classes/com/crm/service/EntitynameService.class
	build/classes/com/crm/service/HometemplatesService.class
	build/classes/com/crm/service/ProfileService.class
	build/classes/com/crm/service/Role2profileService.class
	build/classes/com/crm/service/RoleService.class
	src/com/crm/mapper/XmEntitynameMapper.java
	src/com/crm/mapper/XmEntitynameMapper.xml
	work/org/apache/jsp/module/home/index_jsp.class
	work/org/apache/jsp/settings/groups/index_jsp.class
	work/org/apache/jsp/settings/role/index_jsp.class
	work/org/apache/jsp/settings/role/index_jsp.java
	work/org/apache/jsp/settings/role/showedit_jsp.class
	work/org/apache/jsp/settings/role/showedit_jsp.java
Merge branch 'junz' of git@github.com:App-coder/Optimize.git into zhangjun

Conflicts:
	build/classes/applicationContext-Cache.xml
	build/classes/com/crm/action/module/util/ViewUtil.class
	build/classes/com/crm/action/other/CustomviewController.class
	build/classes/com/crm/action/settings/PortalConfigController.class
	build/classes/com/crm/action/settings/RoleController.class
	build/classes/com/crm/action/util/ActionUtil.class
	build/classes/com/crm/action/util/CustomviewUtil.class
	build/classes/com/crm/bean/Message.class
	build/classes/com/crm/interceptor/cache/MethodCacheInterceptor.class
	build/classes/com/crm/mapper/XmCustomviewMapper.xml
	build/classes/com/crm/mapper/XmEntitynameMapper.class
	build/classes/com/crm/mapper/XmEntitynameMapper.xml
	build/classes/com/crm/mapper/XmFieldMapper.class
	build/classes/com/crm/mapper/XmFieldMapper.xml
	build/classes/com/crm/mapper/XmFilesMapper.class
	build/classes/com/crm/mapper/XmFilesMapper.xml
	build/classes/com/crm/mapper/XmHometemplatesMapper.class
	build/classes/com/crm/mapper/XmHometemplatesMapper.xml
	build/classes/com/crm/mapper/XmImportMapsMapper.class
	build/classes/com/crm/mapper/XmImportMapsMapper.xml
	build/classes/com/crm/mapper/XmProfile2fieldMapper.class
	build/classes/com/crm/mapper/XmProfile2fieldMapper.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/XmProfile2tabMapper.class
	build/classes/com/crm/mapper/XmProfile2tabMapper.xml
	build/classes/com/crm/mapper/XmStep2usersMapper.class
	build/classes/com/crm/mapper/XmStep2usersMapper.xml
	build/classes/com/crm/mapper/XmTrackerMapper.class
	build/classes/com/crm/mapper/XmTrackerMapper.xml
	build/classes/com/crm/mapper/XmUser2roleMapper.class
	build/classes/com/crm/mapper/XmUser2roleMapper.xml
	build/classes/com/crm/mapper/XmUsersLastImportMapper.class
	build/classes/com/crm/mapper/XmUsersLastImportMapper.xml
	build/classes/com/crm/model/XmField.class
	build/classes/com/crm/model/XmHometemplates.class
	build/classes/com/crm/service/CustomviewService.class
	build/classes/com/crm/service/EntitynameService.class
	build/classes/com/crm/service/HometemplatesService.class
	build/classes/com/crm/service/ProfileService.class
	build/classes/com/crm/service/Role2profileService.class
	build/classes/com/crm/service/RoleService.class
	src/com/crm/mapper/XmEntitynameMapper.java
	src/com/crm/mapper/XmEntitynameMapper.xml
	work/org/apache/jsp/module/home/index_jsp.class
	work/org/apache/jsp/settings/groups/index_jsp.class
	work/org/apache/jsp/settings/role/index_jsp.class
	work/org/apache/jsp/settings/role/index_jsp.java
	work/org/apache/jsp/settings/role/showedit_jsp.class
	work/org/apache/jsp/settings/role/showedit_jsp.java

Signed-off-by: mxzjzj <mxzjzj@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/WEB-INF/classes/applicationContext-Cache.xml
	WebContent/WEB-INF/classes/applicationContext-Mapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmBlocksMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmCustomviewMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmCvadvfilterMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmCvcolumnlistMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmCvstdfilterMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmDefOrgFieldMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmEntitynameMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmFieldMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmFilesMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmGroupsMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmHomestuffMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmHometemplatesMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmHometemplatesroleMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmImportMapsMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmPotentialMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmProfile2fieldMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmProfile2globalpermissionsMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmProfile2standardpermissionsMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmProfile2tabMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmQuotesMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmRole2profileMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmRoleMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmSalesorderMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmSeqMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmSqlMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmStep2usersMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmTabMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmTrackerMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmUser2roleMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmUsers2groupMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmUsersLastImportMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmUsersMapper.xml
Merge branch 'zhangjun' of git@github.com:App-coder/Optimize.git into junz

Conflicts:
	WebContent/WEB-INF/classes/applicationContext-Cache.xml
	WebContent/WEB-INF/classes/applicationContext-Mapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmBlocksMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmCustomviewMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmCvadvfilterMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmCvcolumnlistMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmCvstdfilterMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmDefOrgFieldMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmEntitynameMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmFieldMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmFilesMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmGroupsMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmHomestuffMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmHometemplatesMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmHometemplatesroleMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmImportMapsMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmPotentialMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmProfile2fieldMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmProfile2globalpermissionsMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmProfile2standardpermissionsMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmProfile2tabMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmQuotesMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmRole2profileMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmRoleMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmSalesorderMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmSeqMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmSqlMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmStep2usersMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmTabMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmTrackerMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmUser2roleMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmUsers2groupMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmUsersLastImportMapper.xml
	WebContent/WEB-INF/classes/com/crm/mapper/XmUsersMapper.xml

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

Conflicts:
	.idea/workspace.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/other/CustomviewController.class
	out/production/Optimize/com/crm/action/other/CustomviewController.class
Merge branch 'junz' of git@github.com:App-coder/Optimize.git into junz

Conflicts:
	.idea/workspace.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/other/CustomviewController.class
	out/production/Optimize/com/crm/action/other/CustomviewController.class

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