Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2024-10-23 57a26dab8612f2da5a1b073d6276dc3bb58d43d3

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java

@@ -128,6 +128,14 @@
    List<VoOnLineIntake> getOnLineIntakes(Map<?, ?> params);

    /**
     * 根据取水口编号获取取水口对象
     * @param params
     * @return
     */
    VoOnLineIntake getIntakeByName(Map<?, ?> params);


    /**
     * 根据操作员获取常用取水口
     * @return
     */
@@ -154,4 +162,5 @@
     * @return
     */
    List<Long> getIntakeIdByNameExcludeId(@Param("id")Long id, @Param("intakeName")String intakeName);

}