Merge remote-tracking branch 'origin/master'

Houjie

2025-06-10 be8a6f171bd41aa50fb7310b2ccbe753dac20b89

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

@@ -12,7 +12,13 @@

public interface PredictiveWorkOrderMapper extends BaseMapper<PredictiveWorkOrder> {

    public List<PredictiveWorkOrder> pageList(IPage<PredictiveWorkOrder> pageData,@Param("num")String num);
    public List<PredictiveWorkOrder> pageList(IPage<PredictiveWorkOrder> pageData
                                              ,@Param("num")String num
                                              ,@Param("status") String status
                                              ,@Param("equipmentNum") String equipmentNum
                                              ,@Param("equipmentName") String equipmentName

    );

    @Select("<script> select dbo.F_GET_SEQ_ID('${predictiveWorkOrder}') </script>")
    public String getOrderNum(@Param("predictiveWorkOrder")String predictiveWorkOrder);