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

chen_xi

2022-11-17 8e41bd549e3bf0dab2f713ad1c967c4e673c0e5a

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

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


}