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

lizijie

2022-01-24 90d352e2af12d96ea09b0062d8cb6e0d184cbb3f

 screen-api/src/main/java/com/moral/api/pojo/form/historyFiveMinutely/QueryDeviceAndFiveMinuteDataForm.java

@@ -26,4 +26,6 @@
            return false;
        return true;
    }


}