From 1bb18e2806ece36a53e347d9ac439e36b4a37ae9 Mon Sep 17 00:00:00 2001
From: liyuxin <1579178744@qq.com>
Date: Sun, 25 Aug 2024 21:47:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/muyu/market/admain/Product.java       | 6 +++---
 .../com/muyu/market/admain/response/ProductListResp.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cloud-market-common/src/main/java/com/muyu/market/admain/Product.java b/cloud-market-common/src/main/java/com/muyu/market/admain/Product.java
index d67844d..002ae54 100644
--- a/cloud-market-common/src/main/java/com/muyu/market/admain/Product.java
+++ b/cloud-market-common/src/main/java/com/muyu/market/admain/Product.java
@@ -31,8 +31,8 @@ public class Product extends BaseEntity {
     /**
      * 商品ID
      */
-    @TableId(value = "id",type = IdType.AUTO)
-    private Long id;
+    @TableId(value = "product_id",type = IdType.AUTO)
+    private Long productId;
     /**
      * 商品名称
      */
@@ -90,7 +90,7 @@ public class Product extends BaseEntity {
 
         return Product
                 .builder()
-                .id(productId.get())
+                .productId(productId.get())
                 .productName(productUpdReq.getProductName())
                 .productPrice(productUpdReq.getProductPrice())
                 .stock(productUpdReq.getStock())
diff --git a/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductListResp.java b/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductListResp.java
index d144438..0780354 100644
--- a/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductListResp.java
+++ b/cloud-market-common/src/main/java/com/muyu/market/admain/response/ProductListResp.java
@@ -71,7 +71,7 @@ public class ProductListResp {
 
         return ProductListResp
                 .builder()
-                .productId(productlist.getId())
+                .productId(productlist.getProductId())
                 .productName(productlist.getProductName())
                 .productPrice(productlist.getProductPrice())
                 .stock(productlist.getStock())