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

cjl

2023-08-15 224cd3ff175864f6f8ac4bd24468809e73e4115f

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

}