Merge branch 'lvy' of http://219.151.181.73:3000/zhuwei/bladex into test-merge-02

# Conflicts:
#	blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -2107,7 +2107,14 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
             this.updateById(record);
         }
         List<TrialSampleInfo> trialSampleInfoList = dto.getTrialSampleInfoList();
-        if (trialSampleInfoList != null && !trialSampleInfoList.isEmpty()) {
+        TrialSampleInfo info = dto.getTrialSampleInfo();
+        if (trialSampleInfoList == null) {
+            trialSampleInfoList = new ArrayList<>();
+        }
+        if (info != null) {
+            trialSampleInfoList.add(info);
+        }
+        if (!trialSampleInfoList.isEmpty()) {
             List<TrialSampleInfo> trialSampleInfos = new ArrayList<>();
             trialSampleInfoList.forEach(trialSampleInfo -> {
                 TrialSampleInfo sampleInfo = trialSampleInfoMapper.selectById(trialSampleInfo.getId());