Merge branch 'test' into dev

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java

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

@@ -19,7 +19,9 @@ public class ShopSummaryDto {
     }
 
     public void setCateId(String cateId) {
-        this.cateId = cateId;
+        if(StringUtils.isNotBlank(cateId)){
+            this.cateId = cateId;
+        }
     }
 
     public String getShopId() {

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;
 }