Merge remote-tracking branch 'origin/master'

zss

2024-08-12 2c00320ecf5745742b9dc9a960f506165e880727

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

@@ -39,4 +39,8 @@
    Result<?> dataAcquisition(HttpServletRequest request, Integer id, String entrustCode, String sampleCode);

    List<ADto> menu();

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

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