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

jinpengyong

2023-09-05 f3ddba24738e32305ea27eec3ca4c0e1253086d7

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


}