Merge remote-tracking branch 'origin/master'

feige

2024-11-05 b4895bdc5d9268e55c0023b92cc7c2d68ba33e46

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

@@ -25,4 +25,9 @@
    AjaxResult importExcel(MultipartFile file);

    List<ZHonor> selectCondition(ZHonor zHonor);

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

    AjaxResult listType();

}