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

CeDo

2021-05-11 ef82a7dd65015afb75c9a8ab0beb508adc66d9c9

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

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.EditComMngPopulationVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;

import java.util.List;

@@ -128,4 +129,11 @@
     * @return  实有人口电子档信息
     */
    R electronicArchivesPopulation(Long populationId);

    /**
     * 编辑电子档案
     * @param userElectronicFileVO
     * @return
     */
    R editUserElectronicFile(UserElectronicFileVO userElectronicFileVO);
}