Merge remote-tracking branch 'origin/master' into pim_zss

zss

10 天以前 03df670a1dfbcae8031e84e15dff0b77365f0af6

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