Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev_member_voucher_refund

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/constant/CandyRedisConst.java

@@ -4,4 +4,5 @@ public class CandyRedisConst {
     public static final String PREFIX = "candy:";
 
     public static final String BASIC_USER_COUPON = PREFIX.concat("basic:user_coupon:");
+    public static final String BASIC_COUPON_CODE = PREFIX.concat("basic:coupon_code:");
 }

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMgtCouponInfoDto.java

@@ -33,8 +33,8 @@ public class CandyMgtCouponInfoDto implements Serializable {
     private LocalDateTime effectAt;
     private LocalDateTime expireAt;
     //private String operator;
-    //private Date createdAt;
-    //private Date updatedAt;
+    //private LocalDateTime createdAt;
+    //private LocalDateTime updatedAt;
     //private String comment;
 
     /* com.liquidnet.service.candy.entity.CandyMgtCoupon */

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyCoupon.java

@@ -134,9 +134,9 @@ public class CandyCoupon implements Serializable {
      */
     private String operator;
 
-    private Date createdAt;
+    private LocalDateTime createdAt;
 
-    private Date updatedAt;
+    private LocalDateTime updatedAt;
 
     private String comment;