From 87f18dcf64a778555deb85312d4af93f86625c07 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 15:17:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java
index c185060..19a2dfa 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java
@@ -45,7 +45,7 @@
      * 商品id
      */
     @TableField("goods_id")
-    private Long goodsId;
+    private String goodsId;
     /**
      * 商户售价
      */

--
Gitblit v1.7.1