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

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

@@ -0,0 +1,36 @@
+package cn.ysk.cashier.dto;
+
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
+public class BaseQueryDto {
+    private Integer shopId;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    public Integer getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Integer shopId) {
+        this.shopId = shopId;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+}

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

@@ -23,6 +23,7 @@ import javax.persistence.Column;
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.io.Serializable;
+import java.util.List;
 
 /**
 * @website https://eladmin.vip
@@ -192,4 +193,10 @@ public class TbShopInfoDto implements Serializable {
     private String isReturn;
     private String isMemberIn;
     private String isMemberReturn;
+    private Integer isTableFee;
+    private BigDecimal tableFee;
+    private List<String> eatModel;
+    //程序码(零点八零首页)
+    private String smallQrcode;
+    private String paymentQrcode;
 }