数据报表 按分类和商品名称筛选

统计增加 按现金支付统计
用户列表返回数据更新

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

@@ -1,14 +1,13 @@
 package cn.ysk.cashier.dto;
 
-import cn.ysk.cashier.utils.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
 import java.util.Date;
 
 public class ShopSummaryDto {
     private String shopId;
+    private String proName;
     private Integer type;
+    private Integer cateId;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -22,6 +21,14 @@ public class ShopSummaryDto {
         this.shopId = shopId;
     }
 
+    public String getProName() {
+        return proName;
+    }
+
+    public void setProName(String proName) {
+        this.proName = proName;
+    }
+
     public Integer getType() {
         return type;
     }
@@ -30,6 +37,14 @@ public class ShopSummaryDto {
         this.type = type;
     }
 
+    public Integer getCateId() {
+        return cateId;
+    }
+
+    public void setCateId(Integer cateId) {
+        this.cateId = cateId;
+    }
+
     public Date getStartTime() {
         return startTime;
     }