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

Conflicts:
	build/classes/com/crm/mapper/XmFieldMapper.class
	build/classes/com/crm/service/XmFieldService.class
	build/classes/com/crm/service/impl/XmFieldServiceImpl.class
	build/classes/com/crm/util/DateUtil.class
	src/com/crm/mapper/XmFieldMapper.java

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

Conflicts:
	build/classes/com/crm/action/WelcomeController.class
	build/classes/com/crm/action/XmCustomViewController.class
	build/classes/com/crm/action/module/XmCalendarController.class
	build/classes/com/crm/action/relation/XmUsersController.class
	build/classes/com/crm/action/settings/basic/XmRoleController.class
	build/classes/com/crm/mapper/XmCustomviewMapper.class
	build/classes/com/crm/mapper/XmCustomviewMapper.xml
	build/classes/com/crm/mapper/XmSequenceMapper.xml
	build/classes/com/crm/mapper/module/XmActivityMapper.class
	build/classes/com/crm/mapper/module/XmActivityMapper.xml
	build/classes/com/crm/model/XmInvitees.class
	build/classes/com/crm/model/XmSeactivityrel.class
	build/classes/com/crm/service/XmCustomViewService.class
	build/classes/com/crm/service/impl/XmCustomViewServiceImpl.class
	build/classes/com/crm/service/module/XmActivityService.class
	build/classes/com/crm/service/module/impl/XmActivityServiceImpl.class
	build/classes/com/crm/util/DateUtil.class
	build/classes/com/crm/util/HtmlUtil.class
	build/classes/com/crm/util/actionutil/ActionCls.class