Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-order/src/main/java/com/dituhui/pea/order/dto/EngineersGanttDTO.java

@@ -51,6 +51,7 @@ public class EngineersGanttDTO {
          * 工程师工号
          */
         private String engineerCode;
+        private String engineerPhone;
         private String engineerName;
         private String capTotal;
         private String capUsed;

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

@@ -131,6 +131,7 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
             engineer.setEngineerCode(engineerCode)
                     .setHoliday(false) // todo
                     .setEngineerName(engineerInfo.getName())
+                    .setEngineerPhone(engineerInfo.getPhone())
                     .setGrade(engineerInfo.getGrade());
 
             EngineerBusinessEntity engineerBusinessEntity = engineerBusinessDao.getByEngineerCode(engineerCode);