From b7a90c576ac6b482c68ad6d0c2777831f9127b4a Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 19 五月 2020 16:48:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/util/factory/user/vip/GiveVIPApplyInfoRecordVOFactory.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/user/vip/GiveVIPApplyInfoRecordVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/user/vip/GiveVIPApplyInfoRecordVOFactory.java index 62d1082..f4bdb21 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/factory/user/vip/GiveVIPApplyInfoRecordVOFactory.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/user/vip/GiveVIPApplyInfoRecordVOFactory.java @@ -9,10 +9,9 @@ GiveVIPApplyInfoRecordVO vo = new GiveVIPApplyInfoRecordVO(); vo.setCreateTime(info.getCreateTime()); vo.setLevel(info.getLevel()); - if (info.getState() == GiveVIPApplyInfo.STATE_NO_INFO) - vo.setLink(uploadInfoLink.replace("[ID]", info.getId())); - else - vo.setLink(vipLink); + + vo.setLink(uploadInfoLink.replace("[ID]", info.getId())); + if (info.getState() == GiveVIPApplyInfo.STATE_REJECT) vo.setRejectReson(info.getRejectReson()); vo.setState(info.getState()); -- Gitblit v1.8.0