Merge remote-tracking branch 'origin/develop' into jsh77b

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

@@ -103,6 +103,9 @@ public class Customer extends TscBaseDomain {
 	private String marketingModifyYn;
 	private String accountModifyYn;
 
+	private int diffLoginLdt;
+	private int diffJoinDt;
+
 	// 암호화 대상 복호화 처리
 	public String getCustNm() {
 		this.custNm = CryptoUtils.decryptAES(this.custNm);