Merge remote-tracking branch 'origin/master'

zss

2024-07-22 c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a

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

@@ -3,9 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.dto.DeviceDto1;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.vo.Result;

import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;

@@ -33,4 +34,6 @@
    List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass);

    Device selectDeviceByCode(String code);

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