From 09361264d6d87b8ce57b61a26c5507dbc0a01031 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:16:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_玮苓乐器

---
 src/main/resources/mapper/basic/ProductModelMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 9a2f00e..0e252c9 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -23,7 +23,7 @@
     </resultMap>
 
     <select id="listPageProductModel" resultMap="ProductModelVoResultMap">
-        select pm.*,p.product_name
+        select pm.*,p.product_name, ifnull(p.standard_quantity, 0) as product_standard_quantity
         from product_model pm
         left join product p on pm.product_id = p.id
         <where>

--
Gitblit v1.9.3