From 2cc5f6295aeba326b82deaf5f8bded61b9e1ae16 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 07 五月 2023 18:57:59 +0800
Subject: [PATCH] DEMO初步完成

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 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..9d8b476 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;

--
Gitblit v1.7.1