From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 28 三月 2024 14:04:24 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop --- lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml index 3514df8..1d2d2bc 100644 --- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml +++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml @@ -24,7 +24,7 @@ t1.remark remark, t1.parent_factory_model_id parentFactoryModelId from mom_base_work_center t1 left join - (select * from mom_base_equipment_category where del_flag=0) t2 + (select * from mom_eam_equipment_category where del_flag=0) t2 on t1.equipment_team_id = t2.id left join(select * from mom_sys_data_version where del_flag=0) t3 on t1.data_version_id = t3.id @@ -73,7 +73,7 @@ id id, code code, name name - from mom_base_equipment_category + from mom_eam_equipment_category where enterprise_id=#{enterpriseId} and del_flag = 0 </select> -- Gitblit v1.9.3