From 380854ead73ee1a3da277fd48f7f692f17e4781e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 08 一月 2025 11:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 manage/src/main/resources/mapping/TFrameWarehousingDetailMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/manage/src/main/resources/mapping/TFrameWarehousingDetailMapper.xml b/manage/src/main/resources/mapping/TFrameWarehousingDetailMapper.xml
index 75970c0..08639fe 100644
--- a/manage/src/main/resources/mapping/TFrameWarehousingDetailMapper.xml
+++ b/manage/src/main/resources/mapping/TFrameWarehousingDetailMapper.xml
@@ -27,7 +27,7 @@
     </sql>
     <select id="pageList" resultType="com.jilongda.manage.vo.TFrameWarehousingDetailVO">
         select tfwd.id, tfwd.warehousingId, tfwd.brand, tfwd.supplier, tfwd.material, tfwd.total, tfwd.color, tfwd.model, tfwd.code, tfwd.createTime,
-               tfwd.updateTime, tfwd.createBy, tfwd.updateBy, tfwd.isDelete, tfwd.modelId,tw.storeId
+               tfwd.updateTime, tfwd.createBy, tfwd.updateBy, tfwd.isDelete, tfwd.modelId,tw.storeId,tw.status
         from t_frame_warehousing_detail tfwd
         left join t_warehousing tw on tfwd.warehousingId = tw.id
         <where>

--
Gitblit v1.7.1