Merge remote-tracking branch 'origin/master'

wuzeyu

2024-12-13 e2a6779e69ca96a6d538d415613c8c09963ab659

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -54,5 +54,5 @@
     * @param proResultId
     * @return
     */
    VoProcessingResult getProResultById(Long proResultId);
    VoProcessingResult_temp getProResultById(Long proResultId);
}