Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/yx/face/boot/uitls/SMSOrIdCardUtils.java

src/main/java/com/yx/face/boot/uitls/SMSOrIdCardUtils.java

@@ -84,6 +84,7 @@ public class SMSOrIdCardUtils {
     隐藏身份证中间的部分
      */
     public static String hideIdNumber(String idNumber){
+      //  return idNumber.substring(0, 4) +"*****" + idNumber.substring(14);
         if (StringUtils.isEmpty(idNumber) || (idNumber.length() < 8)) {
             return idNumber;
         }