Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPersonnelServiceImpl.java

@@ -158,6 +158,8 @@ public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<Pa
                 patrolInspectionPersonnelVo.setPhoneNumber(list.get(i).getPhoneNumber());
                 patrolInspectionPersonnelVo.setMainPosition(list.get(i).getMainPosition());
                 patrolInspectionPersonnelVo.setServiceContent(list.get(i).getServiceContent());
+                patrolInspectionPersonnelVo.setDispatchCompany(list.get(i).getDispatchCompany());
+                patrolInspectionPersonnelVo.setSecurityCompany(list.get(i).getSecurityCompany());
                 for (int j = 0; j < userList.size(); j++) {
                     if (list.get(i).getUserId().longValue() == userList.get(j).getUserId()) {
                         patrolInspectionPersonnelVo.setName(userList.get(j).getNickName());

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/PatrolInspectionPersonnelVo.java

@@ -141,4 +141,14 @@ public class PatrolInspectionPersonnelVo implements Serializable {
      */
     private String serviceContent;
 
+    /**
+     * 所属派遣公司
+     */
+    private String dispatchCompany;
+
+    /**
+     * 所属保安从业公司
+     */
+    private String securityCompany;
+
 }