Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-10-25 2deb0e8dceb411febeb706a0f9e4346650141a84

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

@@ -76,9 +76,4 @@
    private String isDelete;


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

}