ApiClientUserService.java
1.39 KB
-
Merge remote-tracking branch 'origin/test' into dev_zxm · dd960590# Conflicts: # yd-user-api/src/main/java/com/yd/user/api/controller/ApiClientUserController.java # yd-user-feign/src/main/java/com/yd/user/feign/client/clientuser/ApiClientUserFeignClient.java # yd-user-feign/src/main/java/com/yd/user/feign/fallback/clientuser/ApiClientUserFeignFallbackFactory.java
zhangxingmin committed