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

cjl

2023-07-10 315ec391b2a36a6d796a8726b57b7c2b8908db12

 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;
    }


}