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

lizijie

2021-08-31 b888331b6ba56caeeab12a4543fe81bac8854794

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

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


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

}