diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_2.xml
deleted file mode 100644
index 0f3d7e9..0000000
--- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_2.xml
deleted file mode 100644
index 1477dab..0000000
--- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_2.xml
deleted file mode 100644
index c2363c4..0000000
--- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_2.xml
deleted file mode 100644
index 531cfee..0000000
--- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_2.xml
deleted file mode 100644
index f22aa1e..0000000
--- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_2.xml
deleted file mode 100644
index 2146c4b..0000000
--- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml b/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml
deleted file mode 100644
index 7af89b1..0000000
--- a/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml
deleted file mode 100644
index 0eb2c0a..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml
deleted file mode 100644
index 1271e96..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml
deleted file mode 100644
index f709493..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml
deleted file mode 100644
index 48549e7..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml
deleted file mode 100644
index ae61434..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml
deleted file mode 100644
index 62167e6..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml
deleted file mode 100644
index ea2a427..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml
deleted file mode 100644
index 9c61e39..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml
deleted file mode 100644
index bace373..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml
deleted file mode 100644
index 62f8918..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml
deleted file mode 100644
index 22a1ee5..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml
deleted file mode 100644
index 906a7d8..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml b/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml
deleted file mode 100644
index feefbab..0000000
--- a/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml b/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml
deleted file mode 100644
index 606a7a5..0000000
--- a/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml
deleted file mode 100644
index b4e45d3..0000000
--- a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml b/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml
deleted file mode 100644
index 764185c..0000000
--- a/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml
deleted file mode 100644
index 9d254f7..0000000
--- a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
deleted file mode 100644
index 6978c0b..0000000
--- a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
deleted file mode 100644
index 0695d4b..0000000
--- a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml
deleted file mode 100644
index 7ee5fee..0000000
--- a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml
deleted file mode 100644
index 28f52d3..0000000
--- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml
deleted file mode 100644
index fa302bf..0000000
--- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/emis-api-web/emis-api-web.iml b/emis-api-web/emis-api-web.iml
index 63bf8b7..78ab8d9 100644
--- a/emis-api-web/emis-api-web.iml
+++ b/emis-api-web/emis-api-web.iml
@@ -113,12 +113,7 @@
-
-
-
-
-
@@ -160,7 +155,6 @@
-
@@ -186,34 +180,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -240,7 +206,6 @@
-
@@ -266,6 +231,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
index ee01399..580b621 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
@@ -228,7 +228,7 @@ public class WaybillController extends BaseController
String appKey=ServletUtils.getHeaderValue("appKey");
String sign=ServletUtils.getHeaderValue("sign");
- emisWaybillService.realMatchOrderApi(emisWaybillSave,true);
+ emisWaybillService.realMatchOrderApi(emisWaybillSave);
// 下单成功,查询下单数据
EmisWaybill newBill = emisBaseService.getWaybillByBillCode(emisWaybillSave.getBillCode());