test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 处理冲突

This commit is contained in:
Captain.B 2021-05-22 09:15:15 +08:00 committed by 刘瑞斌
parent ee03716699
commit 89aff52591
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
View File

@ -625,7 +625,6 @@ public class TestCaseService {
data.setNodePath(path.toString());
data.setPriority("P" + i % 4);
String type = types.get(i % 3);
data.setType(type);
// if (StringUtils.equals(TestCaseConstants.Type.Functional.getValue(), type)) {
// data.setMethod(TestCaseConstants.Method.Manual.getValue());
// } else {
@ -695,7 +694,6 @@ public class TestCaseService {
data.setName(t.getName());
data.setNodePath(t.getNodePath());
data.setPriority(t.getPriority());
data.setType(t.getType());
data.setCustomNum(t.getCustomNum());
if (StringUtils.isBlank(t.getStepModel())) {
data.setStepModel(TestCaseConstants.StepModel.STEP.name());