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

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

@@ -105,4 +105,6 @@ public class TbCashierCartDto implements Serializable {
     private String isGift;
 
     private Long pendingAt;
+
+    private String uuid;
 }

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

@@ -157,4 +157,6 @@ public class TbOrderInfoDto implements Serializable {
     private String remark;
 
     private List<TbOrderDetail> detailList;
+
+    private String payRemark;
 }

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

@@ -17,6 +17,7 @@ package cn.ysk.cashier.dto.product;
 
 import lombok.Data;
 import java.io.Serializable;
+import java.util.List;
 
 /**
 * @website https://eladmin.vip
@@ -54,7 +55,7 @@ public class TbProductGroupDto implements Serializable {
     private Integer sort;
 
     /** 商品列表 */
-    private String productIds;
+    private List<String> productIds;
 
     private Long createdAt;