优惠卷相关

eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantCouponDto.java

@@ -18,6 +18,7 @@ package cn.ysk.cashier.dto.shop;
 import lombok.Data;
 import java.math.BigDecimal;
 import java.io.Serializable;
+import java.sql.Timestamp;
 
 /**
 * @website https://eladmin.vip
@@ -44,10 +45,10 @@ public class TbMerchantCouponDto implements Serializable {
     private String shopSnap;
 
     /** 开始时间 */
-    private Long fromTime;
+    private Timestamp fromTime;
 
     /** 到期时间 */
-    private Long toTime;
+    private Timestamp toTime;
 
     /** 限领数量 */
     private Integer limitNumber;

eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java

@@ -169,4 +169,6 @@ public class TbShopInfoDto implements Serializable {
     private String password;
 
     private String profiles;
+
+    private String isOpenYhq;
 }