Merge remote-tracking branch 'origin/master'

Crunchy

2024-08-09 9c06fb2da3250f7b8bfcb5a2b8bd227528af2678

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