Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

昨天 217f8ee47bb19f8e154d4012dbe232f0d7af3a3d

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