From 1151bde4c247b3801f7ab750c7abcc79a6514e10 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 11 四月 2020 09:21:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
index ae8536a..b8074d4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
@@ -86,7 +86,7 @@
* @return
*/
public static MsgMoneyDetail createAlipayAccountValidMsg(AlipayAccountValidNormalHistory valid, Long uid,
- String appName, BigDecimal money, int limitDay, boolean change) {
+ String appName, BigDecimal money, String limitDay, boolean change) {
if (valid == null || uid == null || appName == null)
return null;
@@ -109,7 +109,7 @@
List<ClientTextStyleVO> contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(String.format("鎴愬姛%s鐨勬彁鐜拌处鍙�", changeWay), ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO( limitDay+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
- contentList.add(new ClientTextStyleVO("澶╁唴鏃犳硶淇敼", ClientTextStyleVO.COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("鍐呮棤娉曚慨鏀�", ClientTextStyleVO.COLOR_CONTENT));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),contentList));
--
Gitblit v1.8.0