Merge branch 'feature' of https://gitee.com/liuyingfang/cashier-admin into feature

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbShopCategoryQueryCriteria.java
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java

eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderPayCountVo.java

@@ -0,0 +1,44 @@
+package cn.ysk.cashier.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+@Data
+public class TbOrderPayCountVo{
+    private String payType;
+    private BigDecimal payAmount;
+
+    // 构造函数，参数名需要与查询中的别名一致
+    public TbOrderPayCountVo(String payType, BigDecimal payAmount) {
+        this.payType = payType;
+        this.payAmount = payAmount;
+    }
+
+    // Getter和Setter方法
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
+
+    public BigDecimal getPayAmount() {
+        return payAmount;
+    }
+
+    public void setPayAmount(BigDecimal payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    // toString方法，用于简单的打印信息，可根据需要添加
+    @Override
+    public String toString() {
+        return "TbOrderPayCountVo{" +
+                "payType='" + payType + '\'' +
+                ", payAmount=" + payAmount +
+                '}';
+    }
+}