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

liurunyu

2024-12-17 526ce12364b7f708ba4e59d3588386c70c83930d

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java

@@ -166,7 +166,6 @@
     * @return 所有取水口集合
     */
    public QueryResultVo<List<VoAllIntake>> selectAll() {
        
        QueryResultVo<List<VoAllIntake>> rsVo = new QueryResultVo<>();
        rsVo.obj = this.prIntakeMapper.selectAll();
        return rsVo;
@@ -178,7 +177,7 @@
     * @param id 取水口ID
     * @return 取水口实体
     */
    public PrIntake selectById(Long id) {
    public VoAllIntake selectById(Long id) {
        return this.prIntakeMapper.selectByPrimaryKey(id);
    }