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

kaiyu

2021-09-01 55bddeb7f2bb55498e9ac179b3c9d513d558b7c7

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

@@ -43,9 +43,4 @@
    private Integer version;


    @Override
    protected Serializable pkVal() {
        return null;
    }

}