Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js

src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js

@@ -35,7 +35,7 @@ function Add(props) {
   const signatureUrl = useRef("");
 
   const getXgfProjectListAll = async () => {
-    const { data } = await props["xgfProjectListAll"]();
+    const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 });
     setXgfProjectListAll(data);
   };
 

src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/Add/index.js

@@ -33,7 +33,7 @@ function Add(props) {
   const signatureUrl = useRef("");
 
   const getXgfProjectListAll = async () => {
-    const { data } = await props["xgfProjectListAll"]();
+    const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 });
     setXgfProjectListAll(data);
   };
 

src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js

@@ -39,7 +39,7 @@ function Add(props) {
   };
 
   const getXgfProjectListAll = async () => {
-    const { data } = await props["xgfProjectListAll"]();
+    const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 });
     setXgfProjectListAll(data);
   };
 

src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js

@@ -55,7 +55,7 @@ function Add(props) {
   };
 
   const getXgfProjectListAll = async () => {
-    const { data } = await props["xgfProjectListAll"]();
+    const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 });
     setXgfProjectListAll(data);
   };
 

src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehicleBlacklist/List/index.js

@@ -51,7 +51,8 @@ function List(props) {
           // },
           // { name: "employeeVehicleUserName", label: "车辆所属人" },
           { name: "licenceNo", label: "车牌号" },
-          // { name: "vehicleType", label: "车辆类型", render: (<DictionarySelect dictValue="VEHICLE_TYPE" />) },
+          { name: "licenceType", label: "车牌类型", render: (<DictionarySelect dictValue="LICENCE_TYPE" />) },
+          { name: "vehicleType", label: "车辆类型", render: (<DictionarySelect dictValue="VEHICLE_TYPE" />) },
         ]}
         form={form}
         onFinish={getData}

src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js

@@ -154,6 +154,7 @@ const ReviewModalComponent = (props) => {
   const onSubmit = async (values) => {
     const { success } = await props["vehicleAuditApproval"]({
       id: props.id,
+      vehicleApplyId: props.vehicleApplyId,
       ...values,
     });
     if (success) {