Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r28961 -r28973
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 28961)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 28973)
@@ -2119,7 +2119,7 @@
     /*simon:update needBeStrongPwdWhenModifyPwd当修改密码时，密码是否一定为强密码*/
 	var pwdConfig = sstsConfig.needBeStrongPwdWhenModifyPwd;
 	
-	var obj = {"success":false, "msg":"密码必须包含大写字母、小写字母和数字，长度最小为8位!"};
+	var obj = {"success":false, "msg":"密码必须包含字母和数字，长度最小为8位!"};
 	
     if ( !isUndefinedOrNullOrEmpty(pwdConfig)) {
     	
@@ -2128,7 +2128,7 @@
     		minPwdLength = pwdConfig.minPwdLength;
     	}
     	
-        if (pwd.length < minPwdLength || !/[0-9]+/.test(pwd) || !/[a-z]+/.test(pwd) || !/[A-Z]+/.test(pwd)) {
+        if (pwd.length < minPwdLength || !/[0-9]+/.test(pwd) || !/[a-zA-Z]+/.test(pwd)) {
             obj.success = false;
         } else {
         	obj.success = true;