Merge remote-tracking branch 'origin/master'

zss

2023-09-25 5d24aead2d1a45452942ddfc300fe6a232301a99

 base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -78,7 +78,7 @@
        deviceMapper.delAllDevice(ids);
    }

    //原材料检验-->选择设备
    //选择检验设备
    @Override
    public List<Map<String, Object>> chooseDevice() {
        return deviceMapper.chooseDevice();
@@ -86,7 +86,7 @@

    //新增仪器设备：设备组下拉框
    @Override
    public List<String> listGroup() {
        return deviceMapper.listGroup();
    public List<String> listGroup(Integer type) {
        return deviceMapper.listGroup(type);
    }
}