From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSimpleActivityGoodsVo.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSimpleActivityGoodsVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSimpleActivityGoodsVo.java
index 8a00333..f187507 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSimpleActivityGoodsVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSimpleActivityGoodsVo.java
@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,7 +18,7 @@
public class AppSimpleActivityGoodsVo {
@ApiModelProperty(value = "商品id")
- private Long goodsId;
+ private String goodsId;
@ApiModelProperty(value = "商品名称")
private String goodsName;
@@ -34,12 +36,15 @@
private String goodsTag;
@ApiModelProperty(value = "商品调理问题")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal goodsNurses;
@ApiModelProperty(value = "商品售价")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal salesPrice;
@ApiModelProperty(value = "商品活动价")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal activityPrice;
@ApiModelProperty(value = "活动销售数量")
@@ -49,6 +54,7 @@
private Integer salesNumber;
@ApiModelProperty(value = "已售比例")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal salesPercent;
--
Gitblit v1.7.1