Merge branch 'master' into 122run

src/main/java/com/diagbot/mapper/QcresultInfoMapper.java

@@ -8,6 +8,7 @@ import com.diagbot.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**