Merge branch 'develop' into order

src/main/java/com/style24/persistence/domain/Customer.java

@@ -125,14 +125,18 @@ public class Customer extends TscBaseDomain {
 	}
 
 	public String getMaskingCustNm() {
+		custNm = CryptoUtils.decryptAES(custNm);
 		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.name(custNm) : custNm;
+
 	}
 
 	public String getMaskingCellPhnno() {
+		cellPhnno = CryptoUtils.decryptAES(cellPhnno);
 		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.phoneNo(cellPhnno) : cellPhnno;
 	}
 
 	public String getMaskingEmail() {
+		email = CryptoUtils.decryptAES(email);
 		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.email(email) : email;
 	}