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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComExServicemanService.java

@@ -1,18 +1,9 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComExServicemanDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;

import java.util.List;

/**
 * @auther txb
@@ -23,8 +14,10 @@

    /**
     * 分页查询退役军人列表
     * @param comExServicemanDTO   请求参数
     * @return  退役军人列表
     * 
     * @param comExServicemanDTO
     *            请求参数
     * @return 退役军人列表
     */
    R getPageExServiceman(ComExServicemanDTO comExServicemanDTO);