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

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -625,5 +625,5 @@ public interface GovOrgOpenFeignClient {
      * @date 2022/5/11 09:46
      */
     @PostMapping("/gov/org/house/houseupdate")
-    Result houseUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseAddFormDTO formDTO);
+    Result houseUpdate(@RequestBody IcHouseAddFormDTO formDTO);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -401,7 +401,7 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     }
 
     @Override
-    public Result houseUpdate(TokenDto tokenDTO, IcHouseAddFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "houseUpdate", tokenDTO,formDTO);
+    public Result houseUpdate( IcHouseAddFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "houseUpdate",formDTO);
     }
 }