Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mjava-ts/src/main/resources/application-test.yml

mjava-ts/src/main/resources/application-dev.yml

@@ -57,7 +57,8 @@ aliwork:
 sap:
   customer-balance-url: ${SAP_CUSTOMER_BALANCE_URL:}
   customer-unlock-order-url: ${SAP_CUSTOMER_UNLOCK_ORDER_URL:}
-  QA_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/10-QA-team-fssc/tk_oa_to_sap_p2p?bearer_token=bBiGTA7PS0JJ6wKhQU8Vm0vLsIDNjLaN&interface_id="
+  QA_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/00-STG-team-fssc/tk_oa_to_sap_p2p?bearer_token=bBiGTA7PS0JJ6wKhQU8Vm0vLsIDNjLaN&interface_id=" #测试环境的测试平台地址，等飞翔项目结束 改为下面的地址
+  #QA_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/10-QA-team-fssc/tk_oa_to_sap_p2p?bearer_token=bBiGTA7PS0JJ6wKhQU8Vm0vLsIDNjLaN&interface_id="
   JT_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/10-QA-team-fssc/tk_oa_to_sap_r2r_generate_fi_document_with_copa?bearer_token=TVof6BjMdOvJreUmI9DzEepesFVwbfEc&interface_id=SAP020"
   #  JT_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/00-STG-team-fssc/tk_oa_to_sap_r2r_generate_fi_document_with_copa?bearer_token=TVof6BjMdOvJreUmI9DzEepesFVwbfEc&interface_id=SAP020"
   TARGET_URL_Poc: "http://139.224.3.140:8091/stms/openapi/income/bookkeeping"

mjava-ts/src/main/resources/application-test.yml

@@ -57,7 +57,8 @@ aliwork:
 sap:
   customer-inquiry-url: ${SAP_CUSTOMER_INQUIRY_URL:}
   customer-inquiry-token: ${SAP_CUSTOMER_INQUIRY_TOKEN:}
-  QA_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/00-STG-team-fssc/tk_oa_to_sap_p2p?bearer_token=bBiGTA7PS0JJ6wKhQU8Vm0vLsIDNjLaN&interface_id="
+  QA_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/00-STG-team-fssc/tk_oa_to_sap_p2p?bearer_token=bBiGTA7PS0JJ6wKhQU8Vm0vLsIDNjLaN&interface_id=" #测试环境的测试平台地址，等飞翔项目结束 改为下面的地址
+ # QA_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/00-STG-team-fssc/tk_oa_to_sap_p2p?bearer_token=bBiGTA7PS0JJ6wKhQU8Vm0vLsIDNjLaN&interface_id="
   JT_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/10-QA-team-fssc/tk_oa_to_sap_r2r_generate_fi_document_with_copa?bearer_token=TVof6BjMdOvJreUmI9DzEepesFVwbfEc&interface_id=SAP020"
 #  JT_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/00-STG-team-fssc/tk_oa_to_sap_r2r_generate_fi_document_with_copa?bearer_token=TVof6BjMdOvJreUmI9DzEepesFVwbfEc&interface_id=SAP020"
   TARGET_URL_Poc: "http://139.224.3.140:8091/stms/openapi/income/bookkeeping"