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

cjl

2023-07-21 3b4574cf01b839bdac2ef5647a106185d709dd71

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


}