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

kaiyu

2021-08-31 2f3b185bf448a18d61a0dfae4e97b22c3f4cdef7

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

}