Merge branch 'dev' of http://git.izouma.com/xiongzhu/jmrh into dev

src/main/java/com/izouma/jmrh/config/Constants.java

@@ -4,7 +4,7 @@ public interface Constants {
 
     public interface Regex {
         String PHONE    = "^1[3-9]\\d{9}$";
-        String USERNAME = "^[_.@A-Za-z0-9-]*$";
+        String USERNAME = "^[_.@A-Za-z0-9-\\u4e00-\\u9fa5]*$";
         String CHINESE  = "^[\\u4e00-\\u9fa5]+$";
         String ID_NO    = "^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0-2]\\d)|3[0-1])\\d{3}$|^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0-2]\\d)|3[0-1])\\d{3}[0-9xX]$";
         String MAIL     = "^[A-Za-z0-9\\u4e00-\\u9fa5]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$";