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

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

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