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

chen_xi

2022-09-27 f4ab89e7032bea8d3c7e05a44946c3fdb58b7473

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

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


}