Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-28 73a0ffbc8f1c5c625ce4bb3225c0e5e30179520e

 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java

@@ -85,7 +85,13 @@
    @Override
    public List<CollectDto> getGroup(String boxNumber,Long departmentId) {
        return this.baseMapper.getGroup(boxNumber,departmentId);
    }   @Override
    }
    @Override
    public List<CollectDto> getGroupWithStatus(String boxNumber,Long departmentId,Integer status) {
        return this.baseMapper.getGroupWithStatus(boxNumber,departmentId,status);
    }

    @Override
    public List<CollectDto> getGroup1(String boxNumber,Long departmentId) {
        return this.baseMapper.getGroup1(boxNumber,departmentId);
    }