Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

 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();

}