Merge branch 'master' into campain
This commit is contained in:
commit
126f37884d
@ -4481,7 +4481,7 @@ public class MjonMsgDataController {
|
||||
String cellValue = "";
|
||||
|
||||
//String phoneRegExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
|
||||
String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
||||
String phoneRegExp = "^(050[2345678]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
||||
|
||||
int errPhoneCnt = 0;
|
||||
int errNameCnt = 0;
|
||||
@ -4909,7 +4909,7 @@ public class MjonMsgDataController {
|
||||
int errPhoneCnt = 0;
|
||||
|
||||
//String phoneRegExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
|
||||
String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
||||
String phoneRegExp = "^(050[2345678]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
||||
|
||||
List<HashMap<String, String>> json = new ArrayList<HashMap<String, String>>();
|
||||
|
||||
@ -5352,7 +5352,7 @@ public class MjonMsgDataController {
|
||||
}
|
||||
|
||||
//String phoneRegExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
|
||||
String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
||||
String phoneRegExp = "^(050[2345678]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
||||
|
||||
List<HashMap<String, String>> json = new ArrayList<HashMap<String, String>>();
|
||||
PhoneVO pVO = new PhoneVO();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user