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

cjl

2023-10-27 509c208bab15c3b125b5e3f8e6df141fb1d85acb

 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;
    }

}