From 3b1be358f4d8709d53901d9e16d4d1552b2d0b4f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 23:07:46 +0800
Subject: [PATCH] 合并远程分支，并处理冲突
---
service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
index 3fcb232..9ad5f22 100755
--- a/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
@@ -441,6 +441,11 @@
feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
businessFee.putAll(feeMap);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
+
+ //涓哄仠杞﹁垂鍗曠嫭澶勭悊
+ paramInJson.put("carFeeEndTime", feeInfo.getEndTime());
+ paramInJson.put("carPayerObjType", feeInfo.getPayerObjType());
+ paramInJson.put("carPayerObjId", feeInfo.getPayerObjId());
return business;
}
--
Gitblit v1.8.0