Skip to content

V
vehicle-quality-review
Commit beff6744 authored by 王飞's avatar 王飞
Browse files
Options

Merge branch 'gaoying' into 'dev' 

Gaoying

See merge request !130
parents 6db5389f 6284ea32
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
quality-review/src/main/java/com/ruoyi/domain/vo/SampleTaskVo.java
View file @ beff6744
...@@ -14,5 +14,5 @@ import java.util.List; ...@@ -14,5 +14,5 @@ import java.util.List;
public class SampleTaskVo { public class SampleTaskVo {
private Long taskId; private Long taskId;
private Long SampleId; private Long SampleId;
private String taskName; private String taskNo;
} }
quality-review/src/main/resources/mapper/TaskSampleRelationMapper.xml
View file @ beff6744
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
SELECT SELECT
relation.sample_id, relation.sample_id,
relation.task_id, relation.task_id,
task.NAME As taskName task.task_no As taskNo
FROM FROM
t_task_sample_relation relation t_task_sample_relation relation
LEFT JOIN t_task task ON task.id = relation.task_id LEFT JOIN t_task task ON task.id = relation.task_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment