Merge remote-tracking branch 'origin/master'

zss

2024-08-03 f608e00e49461f60ba8df1566fc4b9a998430ace

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

@@ -44,5 +44,5 @@

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

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