From 91d0826fffcc79d5869b15fffe4392399d23f0b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 26 四月 2020 17:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java
index a9aaeba..d1acaad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java
@@ -199,15 +199,15 @@
* @param beizu
* @return
*/
- public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1,
- Long targetNum2) {
+ public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1,
+ Long targetNum2, boolean teamPass) {
if (uid == null || originalName == null || upName == null)
return null;
List<CommonMsgItemVO> listMsg = new ArrayList<>();
List<ClientTextStyleVO> contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("鎭枩浣狅紒鏈夋晥", ClientTextStyleVO.COLOR_CONTENT));
- if (targetNum2 == null) {
+ if (teamPass) {
contentList.add(new ClientTextStyleVO("鐩存帴绮変笣宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO(targetNum1+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
contentList.add(new ClientTextStyleVO("浜猴紝鏈夋晥闂存帴绮変笣宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
--
Gitblit v1.8.0