Merge remote-tracking branch 'origin/master'

zss

2025-03-24 17c7e460e0664ef30b34b6a6af8ad72a075d401c

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

@@ -38,7 +38,7 @@

    List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass);

    Device selectDeviceByCode(String code);
    Device selectDeviceByCode(Integer id);

    Result<?> dataAcquisition(HttpServletRequest request, Integer id, String entrustCode, String sampleCode);