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

jinpengyong

2021-09-10 c8aa05fd65cc788abc0f44494338b04993e3b4be

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

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


}