Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

101captain

2022-02-18 307ea3042f5b03e735772e5d3eaad8d5fc16b6ba

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveSubMapper.java

@@ -1,13 +1,13 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
import com.panzhihua.service_community.model.dos.ComActReserveAnswerContentDO;
import com.panzhihua.service_community.model.dos.ComActReserveSubDO;
import java.util.List;

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

import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
import com.panzhihua.service_community.model.dos.ComActReserveSubDO;

/**
 * @auther lyq
@@ -25,5 +25,5 @@
    List<ComActReserveSubListVO> getReserveSubjectList(@Param("reserveId") Long reserveId);



    List<String> subjectSelectionListAdmin(@Param("reserveSubId") Long reserveSubId);
}