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

admin

2019-12-03 1215065e40d634a443cc13e54eefd2b10dcb3061

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -2198,8 +2198,8 @@


         // 2.0.2 版本

         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {



            data.put("redPackLock", redPackForbidService.verifyForbid(uid));

            boolean verifyForbid = redPackForbidService.verifyForbid(uid);

            data.put("redPackLock", verifyForbid);

         }



         out.print(JsonUtil.loadTrueResult(data));