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

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

@@ -74,6 +74,12 @@ public class Coupon extends TscBaseDomain {
     private String pubReasonDtl;
     private String refVal;
     private String secondRefVal;
+    private String useCondition;
+    private String issueCondition;
+    private String expireYn;
+    private int cpnCnt;
+    private String tgtCondition;
+    private String quickYn;
     
     private int custCouponCnt;		// 고객이 쿠폰 다운로드수
     private int totCouponCnt;		// 전체 쿠폰 다운로드수