From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java
index 3e239bd..fe2f7ec 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java
@@ -23,6 +23,8 @@
 
     @ApiModelProperty(value = "商品类型")
     private Integer goodsType;
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
 
 
 }

--
Gitblit v1.7.1