From 21cb23e9f2d5833cf642b0f15a60611c44b37a12 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 25 七月 2024 15:13:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
index 6bf8a26..408f75b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -52,8 +52,8 @@
t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
FROM
(
- select * from sta_device_production_log_past where device_no = #{deviceNo,jdbcType=VARCHAR} union
- select * from sta_device_production_log where device_no = #{deviceNo,jdbcType=VARCHAR}
+ select <include refid="Base_Column_List" /> from sta_device_production_log_past where device_no = #{deviceNo,jdbcType=VARCHAR} union
+ select <include refid="Base_Column_List" /> from sta_device_production_log where device_no = #{deviceNo,jdbcType=VARCHAR}
) t
left join pr_assembly_plan p on t.plan_id=p.id
left join plt_station s on s.id = t.station_id
--
Gitblit v1.8.0