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

Conflicts:
	WebContent/src/applicationContext-Cache.xml
	WebContent/src/com/crm/action/settings/MultiApproveController.class
	WebContent/src/com/crm/mapper/XmEntitynameMapper.xml
	WebContent/src/com/crm/model/XmMemdays.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/applicationContext-Cache.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/applicationContext.xml
	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/util/ViewUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/CangkuassetsController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/GathersyearController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/NotePadController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/NotokcalendarController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/OnlineusersController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/Sub_performanceController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/TodayaccountController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/TopNotesController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/TopPerformanceController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/GroupController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/MultiApproveController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/RoleController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/UsersController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/util/ActionUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmEntitynameMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmEntitynameMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmExpensesMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmMemdaysMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmNotesMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmSeqMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmSeqMapper.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/mapper/XmUsersMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmUsersMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/model/XmExpenses.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/model/XmMemdays.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/model/XmNotes.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/AccountService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/CurrencyInfoService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/GathersService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/GroupsService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/MultiApproveService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/NotesService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/PotentialService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/RoleService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/SalesorderService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/SeqService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/UsersService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/util/Constant.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/util/FileUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/springmvc-servlet.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/web.xml
	out/artifacts/Optimize_war_exploded/module/home/index.jsp
	out/artifacts/Optimize_war_exploded/module/rend/single.jsp
	out/artifacts/Optimize_war_exploded/other/customview/showedit.jsp
	out/artifacts/Optimize_war_exploded/portlets/accountmemdays.jsp
	out/artifacts/Optimize_war_exploded/portlets/announcements.jsp
	out/artifacts/Optimize_war_exploded/portlets/c3crm_news.jsp
	out/artifacts/Optimize_war_exploded/portlets/cangkuassets.jsp
	out/artifacts/Optimize_war_exploded/portlets/com_gathersfinishedbymonth.jsp
	out/artifacts/Optimize_war_exploded/portlets/com_salesfinishedbymonth.jsp
	out/artifacts/Optimize_war_exploded/portlets/datelogs.jsp
	out/artifacts/Optimize_war_exploded/portlets/expensesmonth.jsp
	out/artifacts/Optimize_war_exploded/portlets/free_tags.jsp
	out/artifacts/Optimize_war_exploded/portlets/gathersyear.jsp
	out/artifacts/Optimize_war_exploded/portlets/notepad.jsp
	out/artifacts/Optimize_war_exploded/portlets/notok_calendar.jsp
	out/artifacts/Optimize_war_exploded/portlets/online_users.jsp
	out/artifacts/Optimize_war_exploded/portlets/salesyear.jsp
	out/artifacts/Optimize_war_exploded/portlets/salesyearinfo.jsp
	out/artifacts/Optimize_war_exploded/portlets/short_cuts.jsp
	out/artifacts/Optimize_war_exploded/portlets/sub_performance.jsp
	out/artifacts/Optimize_war_exploded/portlets/today_account.jsp
	out/artifacts/Optimize_war_exploded/portlets/top_account.jsp
	out/artifacts/Optimize_war_exploded/portlets/top_calendar.jsp
	out/artifacts/Optimize_war_exploded/portlets/top_gather.jsp
	out/artifacts/Optimize_war_exploded/portlets/top_notes.jsp
	out/artifacts/Optimize_war_exploded/portlets/top_performance.jsp
	out/artifacts/Optimize_war_exploded/portlets/top_potential.jsp
	out/artifacts/Optimize_war_exploded/portlets/top_quote.jsp
	out/artifacts/Optimize_war_exploded/portlets/top_salesorder.jsp
	out/artifacts/Optimize_war_exploded/portlets/user_salesbymonth.jsp
	out/artifacts/Optimize_war_exploded/portlets/user_salesfinishedbymonth.jsp
	out/artifacts/Optimize_war_exploded/resources/js/global.js
	out/artifacts/Optimize_war_exploded/resources/style/reset.css
	out/artifacts/Optimize_war_exploded/resources/style/style.css
	out/artifacts/Optimize_war_exploded/settings/groups/index.jsp
	out/artifacts/Optimize_war_exploded/settings/multiapprove/approvestep.jsp
	out/artifacts/Optimize_war_exploded/settings/multiapprove/showapprovestep.jsp
	out/artifacts/Optimize_war_exploded/settings/role/index.jsp
	out/artifacts/Optimize_war_exploded/settings/role/showedit.jsp
	out/artifacts/Optimize_war_exploded/settings/users/index.jsp
	out/artifacts/Optimize_war_exploded/settings/users/showedit.jsp
	out/artifacts/Optimize_war_exploded/settings/users/view.jsp
	out/production/Optimize/applicationContext-Cache.xml
	out/production/Optimize/applicationContext.xml
	out/production/Optimize/com/crm/action/module/RendController.class
	out/production/Optimize/com/crm/action/module/util/ViewUtil.class
	out/production/Optimize/com/crm/action/portlets/CangkuassetsController.class
	out/production/Optimize/com/crm/action/portlets/GathersyearController.class
	out/production/Optimize/com/crm/action/portlets/NotePadController.class
	out/production/Optimize/com/crm/action/portlets/NotokcalendarController.class
	out/production/Optimize/com/crm/action/portlets/OnlineusersController.class
	out/production/Optimize/com/crm/action/portlets/Sub_performanceController.class
	out/production/Optimize/com/crm/action/portlets/TodayaccountController.class
	out/production/Optimize/com/crm/action/portlets/TopNotesController.class
	out/production/Optimize/com/crm/action/portlets/TopPerformanceController.class
	out/production/Optimize/com/crm/action/settings/GroupController.class
	out/production/Optimize/com/crm/action/settings/MultiApproveController.class
	out/production/Optimize/com/crm/action/settings/RoleController.class
	out/production/Optimize/com/crm/action/settings/UsersController.class
	out/production/Optimize/com/crm/action/util/ActionUtil.class
	out/production/Optimize/com/crm/mapper/XmEntitynameMapper.class
	out/production/Optimize/com/crm/mapper/XmEntitynameMapper.xml
	out/production/Optimize/com/crm/mapper/XmExpensesMapper.xml
	out/production/Optimize/com/crm/mapper/XmMemdaysMapper.xml
	out/production/Optimize/com/crm/mapper/XmNotesMapper.xml
	out/production/Optimize/com/crm/mapper/XmSeqMapper.class
	out/production/Optimize/com/crm/mapper/XmSeqMapper.xml
	out/production/Optimize/com/crm/mapper/XmSqlMapper.class
	out/production/Optimize/com/crm/mapper/XmSqlMapper.xml
	out/production/Optimize/com/crm/mapper/XmUsersMapper.class
	out/production/Optimize/com/crm/mapper/XmUsersMapper.xml
	out/production/Optimize/com/crm/model/XmExpenses.class
	out/production/Optimize/com/crm/model/XmMemdays.class
	out/production/Optimize/com/crm/model/XmNotes.class
	out/production/Optimize/com/crm/service/AccountService.class
	out/production/Optimize/com/crm/service/CurrencyInfoService.class
	out/production/Optimize/com/crm/service/GathersService.class
	out/production/Optimize/com/crm/service/GroupsService.class
	out/production/Optimize/com/crm/service/MultiApproveService.class
	out/production/Optimize/com/crm/service/NotesService.class
	out/production/Optimize/com/crm/service/PotentialService.class
	out/production/Optimize/com/crm/service/RoleService.class
	out/production/Optimize/com/crm/service/SalesorderService.class
	out/production/Optimize/com/crm/service/SeqService.class
	out/production/Optimize/com/crm/service/UsersService.class
	out/production/Optimize/com/crm/util/Constant.class
	out/production/Optimize/com/crm/util/FileUtil.class
Signed-off-by: mxzjzj <mxzjzj@gmail.com>
Merge branch 'junz' of git@github.com:App-coder/Optimize.git into zhangjun

Conflicts:
	out/artifacts/Optimize/lib/mybatis-3.2.0.jar
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/applicationContext-Cache.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/applicationContext.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/module/DailylogsController.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/WebmailsController.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/portlets/AnnouncementsController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/C3crmnewsController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/TopGatherController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/TopNotesController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/TopPerformanceController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/TopPotentialController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/TopQuoteController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/TopSalesbymonthController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/TopSalesorderController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/UserSalesbymonthController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/portlets/UserSalesfinishedbymonthController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/CurrencyController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/CustomsharingController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/DbbackupController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/EmailconfigController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/EmailtemplatesController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/LicenseController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/MsgconfigController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/MultiApproveController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/MultiwarehouseController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/OrgconfigController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/OrgsharingController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/PortalConfigController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/RecyclebinController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/RoleController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/SyslogController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/settings/UsersController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/util/ActionUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/welcome/PortalController.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/action/welcome/util/UserUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/bean/AjaxView2.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/bean/session/UserPower.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/interceptor/BaseInterceptor.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/interceptor/cache/MethodCacheInterceptor.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/listener/SessionListener.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmActivityMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmActivityMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmCangkusMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmCangkuserrelMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmCangkuserrelMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmCurrencyInfoMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmCustomsharingsMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmCustomsharingsMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmDefOrgShareMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmEmailtemplatesMapper.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/XmOrgShareActionMappingMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmOrgShareActionMappingMapper.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/mapper/XmUsersMapper.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/mapper/XmUsersMapper.xml
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/model/XmCurrencyInfo.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/model/XmCustomsharings.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/model/XmGroups.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/ActivityService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/CangkusService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/CurrencyInfoService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/CustomsharingsService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/CustomviewService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/DefOrgShareService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/EmailtemplatesService.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/GroupsService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/LoginhistoryService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/MultiApproveService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/OrganizationdetailsService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/SeqService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/SqlService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/SystemsService.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/service/UsersService.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/FileUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/com/crm/util/FreemarkerUtil.class
	out/artifacts/Optimize_war_exploded/WEB-INF/classes/log4j.properties
	out/artifacts/Optimize_war_exploded/WEB-INF/web.xml
	out/artifacts/Optimize_war_exploded/index.jsp
	out/artifacts/Optimize_war_exploded/module/events/index.jsp
	out/artifacts/Optimize_war_exploded/module/home/index.jsp
	out/artifacts/Optimize_war_exploded/module/rend/single.jsp
	out/artifacts/Optimize_war_exploded/nav.jsp
	out/artifacts/Optimize_war_exploded/note/1.txt
	out/artifacts/Optimize_war_exploded/portlets/salesyearinfo.jsp
	out/artifacts/Optimize_war_exploded/resources/js/global.js
	out/artifacts/Optimize_war_exploded/resources/plugins/kindeditor/plugins/filemanager/filemanager.js
	out/artifacts/Optimize_war_exploded/resources/style/reset.css
	out/artifacts/Optimize_war_exploded/resources/style/style.css
	out/artifacts/Optimize_war_exploded/settings/currency/index.jsp
	out/artifacts/Optimize_war_exploded/settings/customsharing/index.jsp
	out/artifacts/Optimize_war_exploded/settings/dbbackup/index.jsp
	out/artifacts/Optimize_war_exploded/settings/emailconfig/index.jsp
	out/artifacts/Optimize_war_exploded/settings/emailtemplates/index.jsp
	out/artifacts/Optimize_war_exploded/settings/license/index.jsp
	out/artifacts/Optimize_war_exploded/settings/multiwarehouse/index.jsp
	out/artifacts/Optimize_war_exploded/settings/orgconfig/index.jsp
	out/artifacts/Optimize_war_exploded/settings/orgsharing/index.jsp
	out/artifacts/Optimize_war_exploded/settings/portalconfig/index.jsp
	out/artifacts/Optimize_war_exploded/settings/recyclebin/index.jsp
	out/artifacts/Optimize_war_exploded/settings/syslog/index.jsp
	out/artifacts/Optimize_war_exploded/src/applicationContext-Cache.xml
	out/artifacts/Optimize_war_exploded/src/applicationContext.xml
	out/artifacts/Optimize_war_exploded/src/com/crm/mapper/XmCustomsharingsMapper.xml
	out/artifacts/Optimize_war_exploded/src/com/crm/mapper/XmDefOrgShareMapper.xml
	out/artifacts/Optimize_war_exploded/src/com/crm/mapper/XmEntitynameMapper.xml
	out/artifacts/Optimize_war_exploded/src/com/crm/mapper/XmExpensesMapper.xml
	out/artifacts/Optimize_war_exploded/src/com/crm/mapper/XmNotesMapper.xml
	out/artifacts/Optimize_war_exploded/src/com/crm/mapper/XmOrgShareActionMappingMapper.xml
	out/artifacts/Optimize_war_exploded/src/com/crm/mapper/XmSeqMapper.xml
	out/artifacts/Optimize_war_exploded/src/com/crm/mapper/XmSqlMapper.xml
	out/artifacts/Optimize_war_exploded/src/com/crm/mapper/XmUsersMapper.xml
	out/artifacts/Optimize_war_exploded/src/log4j.properties
	out/production/Optimize/applicationContext-Cache.xml
	out/production/Optimize/applicationContext.xml
	out/production/Optimize/com/crm/action/module/DailylogsController.class
	out/production/Optimize/com/crm/action/module/EventsController.class
	out/production/Optimize/com/crm/action/module/WebmailsController.class
	out/production/Optimize/com/crm/action/module/util/ViewUtil.class
	out/production/Optimize/com/crm/action/portlets/AnnouncementsController.class
	out/production/Optimize/com/crm/action/portlets/C3crmnewsController.class
	out/production/Optimize/com/crm/action/portlets/TopGatherController.class
	out/production/Optimize/com/crm/action/portlets/TopNotesController.class
	out/production/Optimize/com/crm/action/portlets/TopPerformanceController.class
	out/production/Optimize/com/crm/action/portlets/TopPotentialController.class
	out/production/Optimize/com/crm/action/portlets/TopQuoteController.class
	out/production/Optimize/com/crm/action/portlets/TopSalesbymonthController.class
	out/production/Optimize/com/crm/action/portlets/TopSalesorderController.class
	out/production/Optimize/com/crm/action/portlets/UserSalesbymonthController.class
	out/production/Optimize/com/crm/action/portlets/UserSalesfinishedbymonthController.class
	out/production/Optimize/com/crm/action/settings/CurrencyController.class
	out/production/Optimize/com/crm/action/settings/CustomsharingController.class
	out/production/Optimize/com/crm/action/settings/DbbackupController.class
	out/production/Optimize/com/crm/action/settings/EmailconfigController.class
	out/production/Optimize/com/crm/action/settings/EmailtemplatesController.class
	out/production/Optimize/com/crm/action/settings/LicenseController.class
	out/production/Optimize/com/crm/action/settings/MsgconfigController.class
	out/production/Optimize/com/crm/action/settings/MultiApproveController.class
	out/production/Optimize/com/crm/action/settings/MultiwarehouseController.class
	out/production/Optimize/com/crm/action/settings/OrgconfigController.class
	out/production/Optimize/com/crm/action/settings/OrgsharingController.class
	out/production/Optimize/com/crm/action/settings/PortalConfigController.class
	out/production/Optimize/com/crm/action/settings/RecyclebinController.class
	out/production/Optimize/com/crm/action/settings/RoleController.class
	out/production/Optimize/com/crm/action/settings/SyslogController.class
	out/production/Optimize/com/crm/action/settings/UsersController.class
	out/production/Optimize/com/crm/action/util/ActionUtil.class
	out/production/Optimize/com/crm/action/welcome/PortalController.class
	out/production/Optimize/com/crm/action/welcome/util/UserUtil.class
	out/production/Optimize/com/crm/bean/AjaxView2.class
	out/production/Optimize/com/crm/bean/session/UserPower.class
	out/production/Optimize/com/crm/interceptor/BaseInterceptor.class
	out/production/Optimize/com/crm/interceptor/cache/MethodCacheInterceptor.class
	out/production/Optimize/com/crm/listener/SessionListener.class
	out/production/Optimize/com/crm/mapper/XmActivityMapper.class
	out/production/Optimize/com/crm/mapper/XmActivityMapper.xml
	out/production/Optimize/com/crm/mapper/XmCangkusMapper.xml
	out/production/Optimize/com/crm/mapper/XmCangkuserrelMapper.class
	out/production/Optimize/com/crm/mapper/XmCangkuserrelMapper.xml
	out/production/Optimize/com/crm/mapper/XmCurrencyInfoMapper.xml
	out/production/Optimize/com/crm/mapper/XmCustomsharingsMapper.class
	out/production/Optimize/com/crm/mapper/XmCustomsharingsMapper.xml
	out/production/Optimize/com/crm/mapper/XmDefOrgShareMapper.xml
	out/production/Optimize/com/crm/mapper/XmEmailtemplatesMapper.xml
	out/production/Optimize/com/crm/mapper/XmFieldMapper.class
	out/production/Optimize/com/crm/mapper/XmFieldMapper.xml
	out/production/Optimize/com/crm/mapper/XmOrgShareActionMappingMapper.class
	out/production/Optimize/com/crm/mapper/XmOrgShareActionMappingMapper.xml
	out/production/Optimize/com/crm/mapper/XmSqlMapper.class
	out/production/Optimize/com/crm/mapper/XmSqlMapper.xml
	out/production/Optimize/com/crm/mapper/XmUsersMapper.class
	out/production/Optimize/com/crm/mapper/XmUsersMapper.xml
	out/production/Optimize/com/crm/model/XmCurrencyInfo.class
	out/production/Optimize/com/crm/model/XmCustomsharings.class
	out/production/Optimize/com/crm/model/XmGroups.class
	out/production/Optimize/com/crm/service/ActivityService.class
	out/production/Optimize/com/crm/service/CangkusService.class
	out/production/Optimize/com/crm/service/CurrencyInfoService.class
	out/production/Optimize/com/crm/service/CustomsharingsService.class
	out/production/Optimize/com/crm/service/CustomviewService.class
	out/production/Optimize/com/crm/service/DefOrgShareService.class
	out/production/Optimize/com/crm/service/EmailtemplatesService.class
	out/production/Optimize/com/crm/service/FieldService.class
	out/production/Optimize/com/crm/service/GroupsService.class
	out/production/Optimize/com/crm/service/LoginhistoryService.class
	out/production/Optimize/com/crm/service/MultiApproveService.class
	out/production/Optimize/com/crm/service/OrganizationdetailsService.class
	out/production/Optimize/com/crm/service/SeqService.class
	out/production/Optimize/com/crm/service/SqlService.class
	out/production/Optimize/com/crm/service/SystemsService.class
	out/production/Optimize/com/crm/service/UsersService.class
	out/production/Optimize/com/crm/util/DateUtil.class
	out/production/Optimize/com/crm/util/FileUtil.class
	out/production/Optimize/com/crm/util/FreemarkerUtil.class
	out/production/Optimize/log4j.properties
	src/applicationContext.xml
Signed-off-by: mxzjzj <mxzjzj@gmail.com>
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