From f300ac5af5afc40c7a225768ad4cfa36ff99a11f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 19 七月 2025 13:50:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/resources/mapper/manager/WarehouseStockMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/resources/mapper/manager/WarehouseStockMapper.xml b/rsf-server/src/main/resources/mapper/manager/WarehouseStockMapper.xml
index e0ccacc..1f3ada5 100644
--- a/rsf-server/src/main/resources/mapper/manager/WarehouseStockMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/WarehouseStockMapper.xml
@@ -5,6 +5,7 @@
SELECT id,
loc_id,
loc_code,
+ warehouse,
type,
order_item_id,
wk_type,
--
Gitblit v1.9.1