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

Conflicts:
	WebContent/resources/css.css
	build/classes/com/crm/action/settings/basic/XmUsersController.class
Signed-off-by: Toney <458820281@qq.com>
Signed-off-by: Toney <458820281@qq.com>
Signed-off-by: Toney <458820281@qq.com>
Signed-off-by: Toney <458820281@qq.com>
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun

Conflicts:
	WebContent/resources/css.css
	build/classes/com/crm/action/settings/basic/XmUsersController.class
	build/classes/com/crm/mapper/XmFieldMapper.class
	build/classes/com/crm/service/XmFieldService.class
	build/classes/com/crm/service/impl/XmFieldServiceImpl.class
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun

Conflicts:
	WebContent/resources/css.css
	build/classes/com/crm/action/settings/basic/XmUsersController.class
	build/classes/com/crm/mapper/XmFieldMapper.class
	build/classes/com/crm/service/XmFieldService.class
	build/classes/com/crm/service/impl/XmFieldServiceImpl.class

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

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