Merge remote-tracking branch 'origin/master'

This commit is contained in:
2024-06-07 11:21:27 +08:00

View File

@@ -1947,7 +1947,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
LineDetail lineDetail = new LineDetail(); LineDetail lineDetail = new LineDetail();
BeanUtils.copyProperties(lineParam, lineDetail); BeanUtils.copyProperties(lineParam, lineDetail);
lineDetail.setId(line.getId()); lineDetail.setId(line.getId());
lineDetail.setRunFlag(0);
//判断国网监测点id //判断国网监测点id
if (StrUtil.isNotBlank(lineDetail.getMonitorId())) { if (StrUtil.isNotBlank(lineDetail.getMonitorId())) {
lineDetail.setMonitorFlag(1); lineDetail.setMonitorFlag(1);