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

cjl

2023-07-24 3ce298bd6f26c0807074dc50c73abf0c3abeaf53

 screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationDeleteForm.java

@@ -15,7 +15,7 @@

    private Integer organizationId;

    private Integer deleteChildren;
    private Integer deleteChildren;//1：删除对应子组织  0：不删除对应自组织

    public boolean valid() {
        if (organizationId == null || organizationId == 0|| ObjectUtils.isEmpty(deleteChildren)) {