chore: 合并失败

gongchunyi

3 天以前 b4c3f13af821d10a0ada7164bda95f23bac206e5

 src/main/java/com/ruoyi/lavorissue/mapper/LavorIssueMapper.java

@@ -23,5 +23,5 @@
     */
    IPage<LaborIssue> listPage(Page page, @Param("req") LaborIssue laborIssue);

    List<LaborIssue> list();
    List<LaborIssue> list(@Param("req") LaborIssue laborIssue);
}