From 756b088f04f08ef73b22d5378136aaccd32e2778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 12 Nov 2024 09:24:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=86=E7=BB=84=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/pojo/product/TbProductGroup.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java index e36f5819..7fd19a91 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java +++ b/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 = "排序方式，default-默认，price-价格从高到低，sales-volume-销量由高到低") + private Integer sort_mode; + @Column(name = "`sort`") @ApiModelProperty(value = "排序") private Integer sort; From 5de9575275227d0bd4ae502dfbcf7146c920e72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 12 Nov 2024 09:24:55 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=86=E7=BB=84=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java index 7fd19a91..acafe31e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java @@ -59,7 +59,7 @@ public class TbProductGroup implements Serializable { @Column(name = "`sort_mode`") @ApiModelProperty(value = "排序方式，default-默认，price-价格从高到低，sales-volume-销量由高到低") - private Integer sort_mode; + private String sort_mode; @Column(name = "`sort`") @ApiModelProperty(value = "排序") From 01d4f279aabebef939fc1fcd740d93cf432e95fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 12 Nov 2024 09:25:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=86=E7=BB=84=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java index acafe31e..98611abf 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java @@ -59,7 +59,7 @@ public class TbProductGroup implements Serializable { @Column(name = "`sort_mode`") @ApiModelProperty(value = "排序方式，default-默认，price-价格从高到低，sales-volume-销量由高到低") - private String sort_mode; + private String sortMode; @Column(name = "`sort`") @ApiModelProperty(value = "排序") From ff4b651a4715dba5bdd68c246c0b74951e3f4a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 12 Nov 2024 09:31:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=86=E7=BB=84=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java index 98611abf..185c1570 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java @@ -58,7 +58,7 @@ public class TbProductGroup implements Serializable { private String style; @Column(name = "`sort_mode`") - @ApiModelProperty(value = "排序方式，default-默认，price-价格从高到低，sales-volume-销量由高到低") + @ApiModelProperty(value = "排序方式，0-默认; 1-价格从高到低; 2-销量由高到低;") private String sortMode; @Column(name = "`sort`") From eeea82ed43fe1ce4907d7df68fe03dcb372d3a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 12 Nov 2024 09:32:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=86=E7=BB=84=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/dto/product/TbProductGroupDto.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupDto.java index 5bb4eeba..7ef9a23c 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupDto.java +++ b/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;