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

@@ -214,7 +214,6 @@
                        }
                    }
                    Map<String, Object> map = historyDataMap.get(near_mac);
                    System.out.println(near_mac);
                    if (map != null){
                        String value = map.get("value").toString();
                        JSONObject jsonObject = JSONObject.parseObject(value);