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-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyInspectionStandardDetailMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyInspectionStandardDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyInspectionStandardDetailMapper.java
index 6148d44..d58a2a9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyInspectionStandardDetailMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyInspectionStandardDetailMapper.java
@@ -23,6 +23,6 @@
IPage<Map<String, Object>> getInspectionStandardDetailById(IPage<Map> pageData, @Param("params") Map<String,Object> params);
// @Select("select t1.id as value,concat(t1.code, '/', t1.cycle,t1.cycle_unit) as text,concat(t1.code, '/', t1.cycle,t1.cycle_unit) as title from mom_eam_inspection_cycle t1 left join mom_sys_data_version t2 on t1.id = t2.business_id where t1.del_flag = '0' and t2.version_status = '2'")
- @Select("select t1.id as value,concat(t1.code, '/', t1.name) as text,concat(t1.code, '/', t1.name) as title from mom_eam_inspection_cycle t1 where t1.del_flag = '0' and version_status = '2'")
+ @Select("select t1.id as value,t1.name as text,t1.name as title from mom_eam_inspection_cycle t1 where t1.del_flag = '0' and version_status = '2'")
List<InspectionCycleVo> getInspectionCycle();
}
--
Gitblit v1.9.3