From 648dc97a49027b8f9c080f1d2472da8db2090ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 10 Apr 2025 09:20:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E8=AE=B0=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/product/dto/ConsStockFlowDTO.java   | 2 ++
 .../src/main/resources/mapper/ConsStockFlowMapper.xml         | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ConsStockFlowDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ConsStockFlowDTO.java
index 80bf88926..4aa231d98 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ConsStockFlowDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ConsStockFlowDTO.java
@@ -128,4 +128,6 @@ public class ConsStockFlowDTO implements Serializable {
      */
     private String remark;
 
+    private String vendorName;
+
 }
diff --git a/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml b/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
index bee545ca1..9f883e259 100644
--- a/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
+++ b/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
@@ -61,8 +61,10 @@
         </foreach>
     </select>
     <select id="findConsStockFlowPage" resultType="com.czg.product.dto.ConsStockFlowDTO">
-        select a.*, b.name as productName from tb_cons_stock_flow as a
+        select a.*, b.name as productName, c.`name` as vendorName from tb_cons_stock_flow as a
+        left join tb_shop_vendor as c on c.id=a.vendor_id
         left join tb_product as b on a.product_id = b.id
+
                  where a.shop_id=#{shopId}
         <if test="inOutType != null and inOutType != ''">
             and a.in_out_type = #{inOutType}