Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-03-23 a70d0dfe221e06381b6e290d1dab85c9ab4fdc31

 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;

}