diff --git a/pom.xml b/pom.xml
index c4a29743..fa6a90c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,9 +12,7 @@
16.0.1
-
4.0.9.RELEASE
-
4.1.0.Final
4.0.2.Final
1.0.1.Final
@@ -30,13 +28,11 @@
3.15.0-GA
1.6.5
-
1.1.1
1.8.4
-
1.84
2.1
1.2.6
@@ -66,7 +62,6 @@
3.3
3.2.1
3.0-beta-4
-
2.1.6
@@ -86,16 +81,7 @@
4.7
-
1.3
-
-
-
-
-
-
-
-
2.4
@@ -203,20 +189,16 @@
org.jeecgframework
minidao-pe
${minidao.version}
-
org.springframework
spring-asm
-
org.junit
com.springsource.org.junit
-
-
@@ -311,8 +293,7 @@
org.hibernate
hibernate-core
-
- 4.2.3.Final
+ ${hibernate.version}
org.hibernate
@@ -385,7 +366,6 @@
com.cloudhopper.proxool
proxool
${proxool.version}
-
geronimo-spec-javamail
@@ -836,21 +816,17 @@
${junit.version}
-
org.hamcrest
hamcrest-all
${hamcrest.version}
-
-
com.jayway.jsonpath
json-path
0.8.1
test
-
@@ -919,7 +895,6 @@
commons-httpclient
3.0.1
-
org.apache.geronimo.specs
geronimo-javamail_1.4_spec
@@ -994,9 +969,25 @@
1.0-SNAPSHOT
jar
compile
- -->
+
+
+ org.p3framework
+ jeecg-p3-biz-mail
+ 1.0.0
+ jar
+ compile
+
+ -->
+
+
+ org.p3framework
+ jeecg-p3-biz-mail
+ 1.0.0
+ jar
+ compile
+
diff --git a/src/main/webapp/webpage/system/user/user.jsp b/src/main/webapp/webpage/system/user/user.jsp
index 8053e591..53ff9f20 100644
--- a/src/main/webapp/webpage/system/user/user.jsp
+++ b/src/main/webapp/webpage/system/user/user.jsp
@@ -27,10 +27,10 @@
$("#orgSelect").combobox("setValues", ${orgIdList});
$("#orgSelect").combotree("setValues", ${orgIdList});
}); --%>
-
+// update-start--Author:zhangguoming Date:20140826 for:将combobox修改为combotree
function openDepartmentSelect() {
- $.dialog.setting.zIndex = 9999;
+ $.dialog.setting.zIndex = getzIndex();
var orgIds = $("#orgIds").val();