合并dev分支

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java

@@ -1,13 +0,0 @@
-
-package com.epmet.feign.fallback;
-
-import com.epmet.feign.ResiPartymemberFeignClient;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description 政府端工作人员审核
- * @Author sun
- */
-@Component
-public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient {
-}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -17,7 +17,6 @@
 
 package com.epmet.modules.group.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;