合并代码

puzhibing

2024-03-08 2a3d0885c11a73d41fb03c985f0032086cd8fa07

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

@@ -80,7 +80,7 @@
        List<String> condition5 = vo.getType5().getCondition();
        QueryWrapper<HonorRules> wrapper5 = new QueryWrapper<>();
        wrapper5.eq("type", type5);
        List<HonorRules> list5 = hrService.list(wrapper4);
        List<HonorRules> list5 = hrService.list(wrapper5);
        for (int i = 0; i < list5.size(); i++) {
            list5.get(i).setCondition(Integer.valueOf(condition5.get(i)));
        }