合并fix

songhuangfeng123

2022-08-03 81695c67562b55493a2e98263223c5440e28feed

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetMngService.java

@@ -5,6 +5,7 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetMngDto;

import java.io.Serializable;
import java.util.List;
@@ -17,7 +18,7 @@
 * @since 2022-07-20 11:49:22
 */
public interface TargetMngService extends IService<TargetMng> {
    ResultVO queryAll(PageQuery<TargetMngQueryCriteria> pageQuery);
    ResultVO<List<TargetMngDto>> queryAll(PageQuery<TargetMngQueryCriteria> pageQuery);
    
    List<TargetMng> queryAll(TargetMngQueryCriteria criteria);