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

jpy

2023-05-27 17d054803583cd870dc15dc16551563ff619c658

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

@@ -67,9 +67,4 @@
    private Date createTime;


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

}