Merge remote-tracking branch 'origin/master'

Lius

2024-04-16 44df47f684ec9e4ac1c26b89465a9d179b322b02

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/QuanlityConfirmMapper.java

@@ -23,6 +23,6 @@
     * @param reportNum
     * @return
     */
    List<QuanlityConfirm> myPage(Page<QuanlityConfirm> page,@Param("num")String num,@Param("reportNum")String reportNum,@Param("equipmentNum") String equipmentNum);
    List<QuanlityConfirm> myPage(Page<QuanlityConfirm> page,@Param("num")String num,@Param("reportNum")String reportNum,@Param("equipmentNum") String equipmentNum,@Param("id") String id);

}