Merge remote-tracking branch 'origin/master'

feige

2024-06-11 8a7e33332203a2e1334ba55a4838b6b1060d406c

 zhang-content/src/main/java/com/ruoyi/service/ZHonorService.java

@@ -27,4 +27,7 @@
    List<ZHonor> selectCondition(ZHonor zHonor);

    List<ZHonor> selectByIds(Long[] ids);

    AjaxResult listType();

}