Merge branch 'feature/visit_zhy' into dev

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 @FeignClient(name = ServiceConstant.PLI_POWER_SERVER, fallbackFactory = PliPowerFeignClientFallBackFactory.class)
 public interface PliPowerFeignClient {
 
-    @PostMapping("/pli/power/visitVisitor/logout")
+    @PostMapping("/pli/power/visitVisitor/visitorlogout")
     Result visitorLogout(@RequestBody VisitorLogoutFormDTO formDTO);
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java

@@ -18,7 +18,7 @@ public class PliPowerFeignClientFallBack implements PliPowerFeignClient {
 
     @Override
     public Result visitorLogout(VisitorLogoutFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.PLI_POWER_SERVER, "logout",formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.PLI_POWER_SERVER, "visitorLogout",formDTO);
     }
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/controller/VisitVisitorController.java

@@ -91,7 +91,7 @@ public class VisitVisitorController {
         return new Result();
     }
 
-    @PostMapping("visitlogout")
+    @PostMapping("visitorlogout")
     public Result visitorLogout(@RequestBody VisitorLogoutFormDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);