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

无关风月

1 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -770,7 +770,7 @@
        benefirVo.setUserName(appUser.getName());
        benefirVo.setWpCoin(ToolUtil.isEmpty(appUser.getPlayPaiCoins()) ? 0 : appUser.getPlayPaiCoins());
        benefirVo.setUserIntegral(ToolUtil.isEmpty(appUser.getIntegral()) ? 0 : appUser.getIntegral());
        if (appUser.getIsVip() == 1) {
        if (appUser.getIsVip()!=null&& appUser.getIsVip() == 1) {
            benefirVo.setIsMember("年度会员");
        } else {
            benefirVo.setIsMember("普通用户");