Merge remote-tracking branch 'origin/master'

zouyu

2024-08-07 54f19e72cfac8a1f44d2c52b30cfe92eff12ce2f

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