Merge remote-tracking branch 'origin/master'

zss

2024-08-08 bc7ee9878359b52c666c7c5f386a8e0c65d2056f

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