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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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