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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

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

@@ -59,6 +59,11 @@
     */
    private Date createTime;

    /**
     * 逻辑删除,0：不删除；1：删除
     */
    private String isDelete;


    @Override
    protected Serializable pkVal() {