From f6d7a3f65aea500a275fa5f3f4325730bff16ade Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 九月 2023 09:35:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWellDeptVo.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWellDeptVo.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWellDeptVo.java
index fe4c08d..3abebab 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWellDeptVo.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWellDeptVo.java
@@ -52,11 +52,12 @@
 
     private BigDecimal altitude;
 
-    private Integer deptId;
+    private Long deptId;
 
-    private Integer parentId;
+    private Long parentId;
 
     private String ancestors;
 
     private String deptName;
+
 }

--
Gitblit v1.9.3