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

jinpengyong

2023-10-10 f0837ee21f7650d4413830d4ee90da02bcdd6d36

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

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


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


}