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

hhhyyq

2021-03-17 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO;
import com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO;
import com.panzhihua.service_dangjian.model.dos.ComPbServiceTeamDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -36,4 +37,6 @@
            " </if> " +
            "</script>")
    IPage<ComPbServiceTeamVO> PageComPbServiceTeamDTO(Page page, @Param("pageComPbServiceTeamDTO") PageComPbServiceTeamDTO pageComPbServiceTeamDTO);
    @Select("select * from com_pb_service_team where id=#{id}")
    ComPbServiceTeamDO selectComPbServiceTeamById(@Param("id")Long id);
}