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

jinpengyong

2022-01-20 2ab1de34b119570c99946ab3e480e9d31745518a

 screen-api/src/main/java/com/moral/api/pojo/form/device/MonitorPointQueryForm.java

@@ -25,7 +25,7 @@
    Integer regionCode;

    public boolean valid(){
        if(ObjectUtils.isEmpty(organizationId)||ObjectUtils.isEmpty(regionCode))
        if(ObjectUtils.isEmpty(organizationId))
            return false;
        return true;
    }