Skip to content

yangxiujun / paidan_demo

Go to a project
Commit a318cbb9 by 王力
Options

Merge branch 'dev_orderlist0717' into 'develop' 

新增返回值

See merge request !250
2 parents 0d3df237 5a17a999
Inline Side-by-side
Showing with 2 additions and 0 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java
...@@ -75,6 +75,7 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -75,6 +75,7 @@ public class DispatchServiceImpl implements DispatchService {
item.setType(o.getType()); item.setType(o.getType());
item.setSkill(o.getSkill()); item.setSkill(o.getSkill());
item.setFaultDescribe(o.getFaultDescribe()); item.setFaultDescribe(o.getFaultDescribe());
item.setApplyNote(o.getApplyNote());
String key = String.format("%s%s%s", o.getBrand(), o.getType(), o.getSkill()); String key = String.format("%s%s%s", o.getBrand(), o.getType(), o.getSkill());
SkillInfo skill = skillInfo.get(key); SkillInfo skill = skillInfo.get(key);
...@@ -195,6 +196,7 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -195,6 +196,7 @@ public class DispatchServiceImpl implements DispatchService {
item.setType(o.getType()); item.setType(o.getType());
item.setSkill(o.getSkill()); item.setSkill(o.getSkill());
item.setFaultDescribe(o.getFaultDescribe()); item.setFaultDescribe(o.getFaultDescribe());
item.setApplyNote(o.getApplyNote());
String key = String.format("%s%s%s", o.getBrand(), o.getType(), o.getSkill()); String key = String.format("%s%s%s", o.getBrand(), o.getType(), o.getSkill());
SkillInfo skill = skillInfo.get(key); SkillInfo skill = skillInfo.get(key);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!