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

cjl

2023-12-18 68e750bf109efb0469704e54e48a29649512358c

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

@@ -66,9 +66,5 @@
    private LocalDateTime createTime;


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

}