Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-22 f6ba3e15355e22767e69f8fc14ae22523f8db8dc

 cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java

@@ -97,7 +97,7 @@
         return one1;
        }

        if (one.getLevel().equals("10")){
        if (one.getLevel()==10){
            return one;
        }
        HonorRules one2 = honorRulesService.getOne(new QueryWrapper<HonorRules>().eq("type", integers.get(0)).eq("level", Integer.valueOf(one.getLevel()) + 1));