Merge remote-tracking branch 'origin/master'

feige

2024-08-28 8429b26635252973e325d020af1a4485a0bbfdb0

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

}