Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-08-22 2c743103cfa6e24bcb3fd064845c8cfd8fe8bbe6

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

}