소스 검색

merge conflict resolve

ZhaoJun 1 년 전
부모
커밋
5090d50a60
1개의 변경된 파일2개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 3
      src/pages/Detail/CommitAuditModal.js

+ 2 - 3
src/pages/Detail/CommitAuditModal.js

@@ -1,5 +1,4 @@
 import React, { useEffect, useState, useRef, useMemo, useCallback } from 'react';
-import React, { useEffect, useState, useRef, useMemo, useCallback } from 'react';
 import '@ant-design/compatible/assets/index.css';
 import {
   Modal,
@@ -754,7 +753,7 @@ function CommitAuditModal(props) {
         json: JSON.stringify({ approvalProcess, formList }),
       });
       params.audit_series = uuidv4();
-      if(version.audit_status == 5) {
+      if (version.audit_status == 5) {
         params.audit_status = version.audit_status;
       }
       params.files = uploadList.current.join(',');
@@ -946,7 +945,7 @@ async function getExcel(gridKey) {
   return JSON.parse(JSON.parse(res));
 }
 
-export default connect(({ xflow, detail, user }) => ({
+export default connect(({ xflow, detail, user, list }) => ({
   flowDetail: xflow.flowDetail,
   versionList: detail.versionList,
   currentUser: user.currentUser,