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

cjl

2023-11-22 319fdcaa2d7979b056b2801e11d08fe6ecdff126

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

}