Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/java/com/ruoyi/domain/vo/SampleTaskVo.java

@@ -14,5 +14,5 @@ import java.util.List;
 public class SampleTaskVo {
     private Long taskId;
     private Long SampleId;
-    private String taskName;
+    private String taskNo;
 }

quality-review/src/main/resources/mapper/TaskSampleRelationMapper.xml

@@ -29,7 +29,7 @@
         SELECT
             relation.sample_id,
             relation.task_id,
-            task.NAME As taskName
+            task.task_no As taskNo
         FROM
             t_task_sample_relation relation
                 LEFT JOIN t_task task ON task.id = relation.task_id