diff --git a/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/SetMonitorThresholdValueTemp.html b/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/SetMonitorThresholdValueTemp.html index ab6f2ab..5123749 100644 --- a/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/SetMonitorThresholdValueTemp.html +++ b/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/SetMonitorThresholdValueTemp.html @@ -142,10 +142,18 @@ field: 'temperatureMax', title: '温度最大值' }, + { + field: 'tMaxIdea', + title: '温度过高意见' + }, { field: 'temperatureMin', title: '温度最小值' }, + { + field: 'tMinIdea', + title: '温度过底意见' + }, { field: 'humidityMax', title: '湿度最大值', diff --git a/ruoyi-system/src/main/resources/mapper/system/TSetmonitorthresholdvalueMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TSetmonitorthresholdvalueMapper.xml index 78ad05b..0a2f18e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TSetmonitorthresholdvalueMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TSetmonitorthresholdvalueMapper.xml @@ -80,7 +80,7 @@ select stv.objId, stv.monitorId, - stv.monitorType, + t1.monitorType, stv.temperatureMax, stv.temperatureMin, stv.humidityMax,