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

Conflicts:
	WebContent/WEB-INF/navbar.jsp
	WebContent/resources/desktop/settings/basic/users.js
	build/classes/log4j.properties
	src/log4j.properties
	work/org/apache/jsp/WEB_002dINF/desktop_jsp.class
	work/org/apache/jsp/WEB_002dINF/desktop_jsp.java
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.class
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/basic/group_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/basic/group_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/basic/systemlog_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/setting_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/setting_jsp.java
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun

Conflicts:
	WebContent/WEB-INF/navbar.jsp
	WebContent/resources/desktop/settings/basic/users.js
	build/classes/log4j.properties
	src/log4j.properties
	work/org/apache/jsp/WEB_002dINF/desktop_jsp.class
	work/org/apache/jsp/WEB_002dINF/desktop_jsp.java
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.class
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/basic/group_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/basic/group_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/basic/systemlog_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/setting_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/setting_jsp.java

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

Conflicts:
	build/classes/log4j.properties
	src/log4j.properties
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.class
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.java
	work/org/apache/jsp/WEB_002dINF/public_/viewcv_jsp.class
	work/org/apache/jsp/WEB_002dINF/public_/viewcv_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/basic/group_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/basic/users_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/other/emailtemplates_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/setting_jsp.class
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun

Conflicts:
	build/classes/log4j.properties
	src/log4j.properties
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.class
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.java
	work/org/apache/jsp/WEB_002dINF/public_/viewcv_jsp.class
	work/org/apache/jsp/WEB_002dINF/public_/viewcv_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/basic/group_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/basic/users_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/other/emailtemplates_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/setting_jsp.class

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/WEB-INF/settings/setting.jsp
	WebContent/resources/css.css
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.class
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/basic/role_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/setting_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/setting_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/system/parenttab_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/system/parenttab_jsp.java
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun

Conflicts:
	WebContent/WEB-INF/settings/setting.jsp
	WebContent/resources/css.css
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.class
	work/org/apache/jsp/WEB_002dINF/navbar_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/basic/role_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/setting_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/setting_jsp.java
	work/org/apache/jsp/WEB_002dINF/settings/system/parenttab_jsp.class
	work/org/apache/jsp/WEB_002dINF/settings/system/parenttab_jsp.java

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