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

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

 screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java

@@ -43,7 +43,7 @@
    /**
     * 因子code
     */
    private Integer sensorCode;
    private String sensorCode;

    /**
     * 因子接收的单位
@@ -75,10 +75,5 @@
     */
    private String isDelete;


    @Override
    protected Serializable pkVal() {
        return this.id;
    }

}