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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

 fanli/src/main/java/com/yeshi/fanli/dto/user/UserInviteLevelEnum.java

@@ -3,7 +3,6 @@
public enum UserInviteLevelEnum {

   noActive(0,"未激活", ""),

   actived(0, "已经激活", ""),

   normalVIP(3,"普通会员", ""), 
   highVIP(7,"高级会员", ""), 

   vipApply(7,"超级会员申请中", ""),

   vip(10, "超级会员", ""),