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>
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
hi

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>
gs

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>
Signed-off-by: junzhu052@gmail.com <junzhu052@gmail.com>