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

admin

2020-05-14 0e030420f3edf7baf47cdb6b8edde43b76b52f4e

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/GiveVIPApplyInfoServiceImpl.java

@@ -107,8 +107,8 @@
      if (info == null)

         throw new GiveVIPApplyInfoException(1, "记录不存在");



      if (info.getState() == GiveVIPApplyInfo.STATE_NO_INFO)

         throw new GiveVIPApplyInfoException(2, "用户未提交资料");

//      if (info.getState() == GiveVIPApplyInfo.STATE_NO_INFO)

//         throw new GiveVIPApplyInfoException(2, "用户未提交资料");



      if (info.getState() == GiveVIPApplyInfo.STATE_REJECT)

         throw new GiveVIPApplyInfoException(3, "已经被拒绝");