From 1386dae36327d03d13354f7fb28a2719e9edf873 Mon Sep 17 00:00:00 2001
From: dy-hu <dy-hu@haihangyun.com>
Date: Fri, 14 Jun 2024 17:06:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=AB=AF=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=BB=E5=9B=BE=E4=B8=8E=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E5=9B=BE=E7=AA=9C=E5=9B=BE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/shop/cereshop/admin/page/product/ShopProduct.java | 6 ++++++
 .../main/resources/mybatis/mapper/product/CereShopProductDAO.xml    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/ShopProduct.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/ShopProduct.java
index b58e9b6..68362e0 100644
--- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/ShopProduct.java
+++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/ShopProduct.java
@@ -38,6 +38,12 @@ public class ShopProduct {
     private String productName;
 
     /**
+     * 商品图片第一张
+     */
+    @ApiModelProperty(value = "商品图片第一张")
+    private String productImage;
+
+    /**
      * 商家名称
      */
     @ApiModelProperty(value = "商家名称")
diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml
index fa79890..8264bab 100644
--- a/cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml
+++ b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml
@@ -409,7 +409,7 @@
   <select id="getAll" parameterType="com.shop.cereshop.admin.param.product.ProductGetAllParam" resultType="com.shop.cereshop.admin.page.product.ShopProduct">
     SELECT a.product_id,a.product_name,c.price,concat('￥',c.price,'~￥',d.price) sectionPrice,
     IF(f.image IS NULL OR f.image='',b.product_image,f.image) image,e.shop_name,
-    c.stock_number,a.shelve_state,a.fictitious_number,a.create_time,g.volume,a.classify_id from cere_shop_product a
+    c.stock_number,a.shelve_state,a.fictitious_number,a.create_time,g.volume,a.classify_id,b.product_image from cere_shop_product a
     LEFT JOIN (SELECT a.product_id,a.product_image from cere_product_image a,
     cere_shop_product b where a.product_id=b.product_id GROUP BY a.product_id) b ON a.product_id=b.product_id
     LEFT JOIN (SELECT a.product_id,a.sku_id,MIN(a.price) price,