Index: ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
===================================================================
diff -u -r12331 -r22262
--- ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 12331)
+++ ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 22262)
@@ -60,8 +60,8 @@
     		return false;
     	}
     	//暂时屏蔽验证复杂密码
-    	if(false && testPasswordReg(Ext.getCmp('newPassword').getValue())){
-    		Ext.MessageBox.show({title:'错误提示', msg:'密码必须是数字与字母组合，长度不小于8！',buttons:Ext.Msg.OK,icon:Ext.Msg.ERROR});
+    	if(testPasswordReg(Ext.getCmp('newPassword').getValue())){
+    		Ext.MessageBox.show({title:'错误提示', msg:'密码必须是数字与字母组合，长度不小于6！',buttons:Ext.Msg.OK,icon:Ext.Msg.ERROR});
     		return false;
     	}
     	if(Ext.getCmp('newPassword').getValue() != Ext.getCmp('confirmNewPassword').getValue()){