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

cjl

2023-08-18 acb0dc47e516cf6942ebe268d9a3fce7944963b9

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

@@ -63,9 +63,5 @@
    private Date createTime;


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

}