Merge remote-tracking branch 'origin/dev' into dev

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java

@@ -1394,7 +1394,8 @@ public class ContractServiceImpl implements ContractService {
         }
 
         // 生成ERP合同映射表
-        ErpContractSaveReqVO erpContractVO = getErpContract(contractMainDO);
+        // ErpContractSaveReqVO erpContractVO = getErpContract(contractMainDO); TODO ERP暂时返回成功
+        ErpContractSaveReqVO erpContractVO = new ErpContractSaveReqVO();
 
         // 调用ERP模块
         JSONObject erpResult = sendToErp(erpContractVO);