Merge remote-tracking branch 'origin/master'

feige

2024-06-11 8a7e33332203a2e1334ba55a4838b6b1060d406c

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

}