Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

6 天以前 f5ee8e7afb178179c1d1d078cf42fe33dc7607f9

 src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java

@@ -126,6 +126,7 @@
            String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
            qualityUnqualified.setDefectivePhenomena(text + "这些指标中存在不合格");//不合格现象
            qualityUnqualified.setInspectId(qualityInspect.getId());
            qualityUnqualified.setId(null);
            qualityUnqualifiedMapper.insert(qualityUnqualified);
        }