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/impl/ComExServicemanServiceImpl.java

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import javax.annotation.Resource;

import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.*;
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.dtos.community.ComExServicemanDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComExServicemanVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyBelongsVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
import com.panzhihua.service_community.dao.ComExServicemanDAO;
import com.panzhihua.service_community.dao.ComMngRealCompanyDAO;
import com.panzhihua.service_community.model.dos.ComExServicemanDO;
import com.panzhihua.service_community.model.dos.ComMngRealCompanyDO;
import com.panzhihua.service_community.service.ComExServicemanService;
import com.panzhihua.service_community.service.ComMngRealCompanyService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
 * @description: 退役军人
@@ -32,7 +20,8 @@
 * @date: 2021/7/15 16:00
 */
@Service
public class ComExServicemanServiceImpl extends ServiceImpl<ComExServicemanDAO, ComExServicemanDO> implements ComExServicemanService {
public class ComExServicemanServiceImpl extends ServiceImpl<ComExServicemanDAO, ComExServicemanDO>
    implements ComExServicemanService {

    @Resource
    private ComExServicemanDAO comExServicemanDAO;