From 5627daeb1ac1a29947e902f9a7efb6730ed98611 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 20:35:50 +0800
Subject: [PATCH] 管理台bug和用户端生日卡

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java
index 42f06f9..3ae0df2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java
@@ -17,7 +17,7 @@
 public class MerGoodsPageVo {
 
     @ApiModelProperty(value = "商品id")
-    private Long goodsId;
+    private String goodsId;
 
     @ApiModelProperty(value = "商品名称")
     private String goodsName;
@@ -35,7 +35,7 @@
     private Integer goodsType;
 
     @ApiModelProperty(value = "商品调理问题")
-    private BigDecimal goodsNurses;
+    private String goodsNurses;
 
     @ApiModelProperty(value = "商品建议售价")
     private BigDecimal suggestSalesPrice;;

--
Gitblit v1.7.1