Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

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

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

    AjaxResult mySave(ZYearInfo zYearInfo);

    AjaxResult listType();

    List<ZYearInfo> selectByCondition();

}