Merge remote-tracking branch 'origin/qms/develop' into qms/develop

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java

@@ -1807,6 +1807,7 @@ public class QmsIssueTicketControllerService {
         vo.setCreateUserName(ticket.getCreateUserName());
         vo.setCreateTime(ticket.getCreateTime());
         vo.setImpactQuantity(ticket.getImpactQuantity());
+        vo.setDirectorId(ticket.getApprovalUserId());
         vo.setTicketType("巡检");
         vo.setIncidentLocation(ticket.getIncidentLocation());
         vo.setIncidentDescription(ticket.getIncidentDescription());

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionTicketDetailVO.java

@@ -62,6 +62,11 @@ public class QmsInspectionTicketDetailVO {
      */
     private String impactQuantity;
 
+    /**
+     * 审批人ID
+     */
+    private Long directorId;
+
     /**
      * 工单类型（巡检）
      */