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

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

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

@@ -209,6 +209,7 @@
                        Device device = devicesMap.get(key);
                        double getmeter1 = LongitudeAndLatitudeUtils.getmeter(point_lon, point_lat, device.getLongitude(), device.getLatitude());
                        if (getmeter1<getmeter){
                            getmeter=getmeter1;
                            near_mac = device.getMac();
                        }
                    }