From 4ed6929b3c8e8d12b64dade132ffd8023cbb73b3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 17:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 224eb5a..3cf81dc 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -77,8 +77,8 @@
         pm.model,
         pm.unit,
         p.product_name,
-        si.warn_num,
-        si.locked_quantity,
+        coalesce(si.warn_num, 0) as warn_num,
+        coalesce(si.locked_quantity, 0) as locked_quantity,
         si.remark,
         si.update_time
         from stock_inventory si

--
Gitblit v1.9.3