From d1632e46b772d691e55b4013585bfe61164b8bde Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 一月 2025 18:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/resources/mapping/TFrameGoods.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/manage/src/main/resources/mapping/TFrameGoods.xml b/manage/src/main/resources/mapping/TFrameGoods.xml
index 67379d2..0a153e9 100644
--- a/manage/src/main/resources/mapping/TFrameGoods.xml
+++ b/manage/src/main/resources/mapping/TFrameGoods.xml
@@ -5,7 +5,7 @@
<select id="lensReceiptList" resultType="com.jilongda.manage.vo.TFrameGoodsVO">
select t1.*,t2.name as model,t5.name as supplier,t3.name as material,t4.name as store,
- t2.sale as sale,t2.cost as cost,t6.name as brand,t7.frameThreshold
+ t2.sale as sales,t2.cost as cost,t6.name as brand,t7.frameThreshold
from
t_frame_goods t1
left join t_model t2 on t1.modelId=t2.id
--
Gitblit v1.7.1