Merge remote-tracking branch 'origin/test' into test

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

@@ -3,8 +3,6 @@ package cn.ysk.cashier.dto.product;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -39,6 +37,11 @@ public class TbProductGroupDto implements Serializable {
 
     private String style;
 
+    /**
+     * 排序方式 0-默认; 1-价格从高到低; 2-销量由高到低;
+     */
+    private String sortMode;
+
     /** 排序 */
     private Integer sort;
 

eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java

@@ -1,11 +1,13 @@
 package cn.ysk.cashier.pojo.product;
 
-import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.copier.CopyOptions;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import javax.persistence.*;
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -55,6 +57,10 @@ public class TbProductGroup implements Serializable {
     @ApiModelProperty(value = "style")
     private String style;
 
+    @Column(name = "`sort_mode`")
+    @ApiModelProperty(value = "排序方式，0-默认; 1-价格从高到低; 2-销量由高到低;")
+    private String sortMode;
+
     @Column(name = "`sort`")
     @ApiModelProperty(value = "排序")
     private Integer sort;