Merge remote-tracking branch 'origin/master'

zss

2024-08-06 80ea05da0c43c2ae14e2d8cf8d284d96d9a8f1f5

 cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java

@@ -43,6 +43,4 @@
    List<Map<String, Object>> treeDevice(String deviceName);

    Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request);

    Object formulaCalculation(Map<String, Object> map, Boolean isAdopt);
}