From 49b93cbbbadb7fc951c71532b02d22100dbc9b11 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 07 五月 2025 14:58:42 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 968d7d7..885c6b7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -51,6 +51,7 @@
ge.operateDt,
blo.`name` AS blockName,
CONCAT(country.`name`, town.`name`, village.`name`) AS address,
+ con.id AS controllerId,
con.rtuAddr,
con.protocol
FROM pr_intake ge
--
Gitblit v1.8.0