Merge branch 'wangfei' into 'dev'

1、修改返回前端的id类型

See merge request !87

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

@@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
 @Data
 public class MatrixColumnVO {
 
-    private Long id;
+    private String id;
 
     @ApiModelProperty("列名称")
     private String title;

quality-review/src/main/java/com/ruoyi/service/impl/MatrixServiceImpl.java

@@ -52,7 +52,7 @@ public class MatrixServiceImpl implements MatrixService {
         List<MatrixColumnVO> columns = new ArrayList();
 
         for(TestType type : types) {
-            MatrixColumnVO column = new MatrixColumnVO(type.getId(), type.getTestType());
+            MatrixColumnVO column = new MatrixColumnVO(String.valueOf(type.getId()), type.getTestType());
             columns.add(column);
         }