Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-19 9a43e3aecfe477dfeae2a32ab758a2f5739614fb

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWellDeptVo.java

@@ -52,7 +52,7 @@

    private BigDecimal altitude;

    private Integer deptId;
    private Long deptId;

    private Integer parentId;