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

jinpengyong

2024-01-31 3c0ccc88ffa8a651ec78a611ffe75775222ebf07

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

@@ -63,9 +63,6 @@
    private Date createTime;


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


}