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

cjl

2023-07-10 315ec391b2a36a6d796a8726b57b7c2b8908db12

 screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java

@@ -128,12 +128,7 @@
            if (lon < 70 || lon > 150 || lat < 20 || lat > 60) {
                return true;
            }
            if(type){
                o.putAll(value);
            }else {

            }

            o.putAll(value);
            return false;
        });
        /*for (Map<String, Object> map:data) {