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

chenxi

2023-05-27 58972583c9f82237068c12a8d8b92e85e8af3c55

 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() {