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

Conflicts:
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/applicationContext-Cache.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/applicationContext-Mapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/applicationContext.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/common/FileController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/AccountsController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/ContactsController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/EventsController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/MaillistsController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/MonthlylogsController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/PoolsController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/QunfasController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/RendController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/WeeklylogsController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/util/ViewAnalytic.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/util/ViewUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/other/CustomviewController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/util/RecyclebinUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/util/ModuleFormUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmContactdetailsMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmContactdetailsMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmFieldMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmFieldMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmMaillistMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmMaillistMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmQunfaMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmQunfaMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmSqlMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmSqlMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/model/XmBlocks.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/model/XmField.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/FieldService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/PicklistService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/SqlService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/util/DateUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/util/FreemarkerUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/logs/xmcrm.log
	out/artifacts/Optimize_war_exploded/WEB-INF/springmvc-servlet.xml
	out/artifacts/Optimize_war_exploded/foot.jsp
	out/artifacts/Optimize_war_exploded/head.jsp
	out/artifacts/Optimize_war_exploded/head2.jsp
	out/artifacts/Optimize_war_exploded/module/dailylogs/index.jsp
	out/artifacts/Optimize_war_exploded/module/events/index.jsp
	out/artifacts/Optimize_war_exploded/module/maillists/index.jsp
	out/artifacts/Optimize_war_exploded/module/monthlylogs/index.jsp
	out/artifacts/Optimize_war_exploded/module/qunfas/index.jsp
	out/artifacts/Optimize_war_exploded/module/rend/cangkupage.jsp
	out/artifacts/Optimize_war_exploded/module/rend/catepage.jsp
	out/artifacts/Optimize_war_exploded/module/rend/showedit.jsp
	out/artifacts/Optimize_war_exploded/module/rend/single.jsp
	out/artifacts/Optimize_war_exploded/module/weeklylogs/index.jsp
	out/artifacts/Optimize_war_exploded/resources/js/global.js
	out/artifacts/Optimize_war_exploded/resources/style/reset.css
	out/artifacts/Optimize_war_exploded/settings/emailtemplates/showedit.jsp
	out/production/Optimize/applicationContext-Cache.xml
	out/production/Optimize/applicationContext-Mapper.xml
	out/production/Optimize/applicationContext.xml
	out/production/Optimize/com/crm/action/common/FileController.class
	out/production/Optimize/com/crm/action/module/AccountsController.class
	out/production/Optimize/com/crm/action/module/ContactsController.class
	out/production/Optimize/com/crm/action/module/EventsController.class
	out/production/Optimize/com/crm/action/module/MaillistsController.class
	out/production/Optimize/com/crm/action/module/MonthlylogsController.class
	out/production/Optimize/com/crm/action/module/PoolsController.class
	out/production/Optimize/com/crm/action/module/QunfasController.class
	out/production/Optimize/com/crm/action/module/RendController.class
	out/production/Optimize/com/crm/action/module/WeeklylogsController.class
	out/production/Optimize/com/crm/action/module/util/ViewAnalytic.class
	out/production/Optimize/com/crm/action/module/util/ViewUtil.class
	out/production/Optimize/com/crm/action/other/CustomviewController.class
	out/production/Optimize/com/crm/action/settings/util/RecyclebinUtil.class
	out/production/Optimize/com/crm/action/util/ModuleFormUtil.class
	out/production/Optimize/com/crm/mapper/XmContactdetailsMapper.class
	out/production/Optimize/com/crm/mapper/XmContactdetailsMapper.xml
	out/production/Optimize/com/crm/mapper/XmFieldMapper.class
	out/production/Optimize/com/crm/mapper/XmFieldMapper.xml
	out/production/Optimize/com/crm/mapper/XmMaillistMapper.class
	out/production/Optimize/com/crm/mapper/XmMaillistMapper.xml
	out/production/Optimize/com/crm/mapper/XmQunfaMapper.class
	out/production/Optimize/com/crm/mapper/XmQunfaMapper.xml
	out/production/Optimize/com/crm/mapper/XmSqlMapper.class
	out/production/Optimize/com/crm/mapper/XmSqlMapper.xml
	out/production/Optimize/com/crm/model/XmBlocks.class
	out/production/Optimize/com/crm/model/XmField.class
	out/production/Optimize/com/crm/service/FieldService.class
	out/production/Optimize/com/crm/service/PicklistService.class
	out/production/Optimize/com/crm/service/SqlService.class
	out/production/Optimize/com/crm/util/DateUtil.class
	out/production/Optimize/com/crm/util/FreemarkerUtil.class

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