Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventApplicationAppReleaseMapper.java

@@ -1,15 +1,15 @@
package com.panzhihua.service_grid.dao;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventApplicationAppReleaseDTO;
import com.panzhihua.common.model.vos.grid.EventApplicationAppReleaseDetailsVO;
import com.panzhihua.service_grid.model.dos.EventApplicationAppReleaseDO;
import com.panzhihua.common.model.vos.grid.EventApplicationAppReleaseVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.panzhihua.service_grid.model.dos.EventApplicationAppReleaseDO;

/**
 * DAO
@@ -28,7 +28,8 @@
     * @param pageEventApplicationAppReleaseDTO
     * @return
     */
    IPage<EventApplicationAppReleaseVO> findByPage(Page page, @Param("pageEventApplicationAppReleaseDTO") PageEventApplicationAppReleaseDTO pageEventApplicationAppReleaseDTO);
    IPage<EventApplicationAppReleaseVO> findByPage(Page page,
        @Param("pageEventApplicationAppReleaseDTO") PageEventApplicationAppReleaseDTO pageEventApplicationAppReleaseDTO);

    EventApplicationAppReleaseDetailsVO editionUpdate();