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