Merge remote-tracking branch 'origin/master'

zss

2024-08-03 f608e00e49461f60ba8df1566fc4b9a998430ace

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

@@ -5,7 +5,6 @@
import com.yuanchu.mom.dto.ADto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.pojo.PkMaster;
import com.yuanchu.mom.vo.Result;

import javax.servlet.http.HttpServletRequest;
@@ -42,4 +41,8 @@
    List<ADto> menu();

    List<Map<String, Object>> treeDevice(String deviceName);

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

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