Merge branch 'dev-gantt' into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerGanttServiceImpl.java

@@ -187,10 +187,9 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
         // log.info("==> getOrderTips: orderId[{}]", orderId);
         List<LabelValueDTO> tips = new ArrayList<>();
         tips.add(new LabelValueDTO().setLabel("工单号码").setValue(order.getOrderId()));
-        tips.add(new LabelValueDTO().setLabel("类型/品牌").setValue(String.format("%s %s", order.getBrand(), order.getType())));
+        tips.add(new LabelValueDTO().setLabel("品牌/类型/技能").setValue(String.format("%s/%s/%s", order.getBrand(), order.getType(), order.getSkill())));
         tips.add(new LabelValueDTO().setLabel("电话/地址").setValue(String.format("%s %s\n %s", order.getName(), order.getPhone(), order.getAddress())));
         tips.add(new LabelValueDTO().setLabel("标签").setValue(order.getTags()));
-        tips.add(new LabelValueDTO().setLabel("技能").setValue(String.format("%s/%s/%s", order.getBrand(), order.getType(), order.getSkill())));
         tips.add(new LabelValueDTO().setLabel("耗时").setValue(String.format("%s分钟", order.getTakeTime())));
         tips.add(new LabelValueDTO().setLabel("期望时间").setValue(String.format("%s-%s",
                 DateUtils.formatDateTime(order.getExpectTimeBegin(), "HH:mm"), DateUtils.formatDateTime(order.getExpectTimeEnd(), "HH:mm"))));