Merge branch 'ww' into test

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java

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

@@ -16,6 +16,8 @@
 package cn.ysk.cashier.dto.product;
 
 import lombok.Data;
+
+import javax.persistence.Column;
 import java.io.Serializable;
 import java.util.List;
 
@@ -60,4 +62,10 @@ public class TbProductGroupDto implements Serializable {
     private Long createdAt;
 
     private Long updatedAt;
+
+    private Integer useTime;
+
+    private String saleStartTime;
+
+    private String saleEndTime;
 }