From 129e30e1a53ad409583c29626af1ac90166dd75a Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Sat, 25 Oct 2025 13:52:45 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E9=94=80=E5=94=AE/=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0memo=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java   | 2 ++
 xkt/src/main/java/com/ruoyi/xkt/domain/StoreSale.java           | 1 -
 .../main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java  | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java
index 7a18376a2..de7174cf5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java
@@ -47,6 +47,8 @@ public class StoreSaleResVO {
     private Integer refundQuantity;
     @ApiModelProperty(value = "销售金额")
     private BigDecimal amount;
+    @ApiModelProperty(value = "备注")
+    private String remark;
     @ApiModelProperty(value = "销售详情列表")
     private List<SaleDetailVO> detailList;
 
diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSale.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSale.java
index de1b6e525..39f1a6313 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSale.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSale.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.XktBaseEntity;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java
index 33c67561b..89581e8ad 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java
@@ -47,6 +47,8 @@ public class StoreSaleResDTO {
     private Integer refundQuantity;
     @ApiModelProperty(value = "销售金额")
     private BigDecimal amount;
+    @ApiModelProperty(value = "备注")
+    private String remark;
     @ApiModelProperty(value = "销售详情列表")
     private List<SSDetailDTO> detailList;