From 0857b855609b1735a1583d69f8289a2d26950419 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 23 五月 2024 11:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
index 0814a5d..0c9c37a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
@@ -107,7 +107,7 @@
select
CAST(pro.id AS char)AS projectId,
pro.project_name AS projectName,
- CAST(uni.id AS char)AS unitId,
+ CAST(uni.id AS char)AS id,
CAST(uni.operator AS char)AS operator,
cli.name AS operatorName,
uni.area,
--
Gitblit v1.8.0