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

jinpengyong

2023-08-04 f64bf4a5879020901fd446e914dfb5914d998c0f

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

}