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

jinpengyong

2023-10-26 9a156c3e20c9dd5c1215bd5dfec5677388777749

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

@@ -19,6 +19,10 @@

    private String sensorCode;

    private String chooseTime;

    private String time;

    public boolean valid(){
        if(ObjectUtils.isEmpty(organizationId)||
                ObjectUtils.isEmpty(regionCode)||
@@ -26,4 +30,6 @@
            return false;
        return true;
    }


}