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

cjl

2023-08-18 571872dd803244bcef2b789e93f3061af00db402

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

}