Merge remote-tracking branch 'origin/master'

wuzeyu

2024-12-13 e2a6779e69ca96a6d538d415613c8c09963ab659

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

@@ -156,7 +156,7 @@
     * 根据操作员获取常用取水口
     * @return
     */
    List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operator") Long operator);
    List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operatorId") Long operatorId);

    /**
     * 取水口名称换取水口ID，扫码开阀使用