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

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiMdCountryServiceImpl.java

@@ -48,6 +48,8 @@ public class ApiMdCountryServiceImpl implements ApiMdCountryService {
         queryWrapper.like("name", name);
         queryWrapper.or();
         queryWrapper.like("country_code", name);
+        queryWrapper.or();
+        queryWrapper.like("area_code", name);
         List<MdCountry> list = mdCountryService.list(queryWrapper);
         // 校验
         if (CollectionUtils.isEmpty(list)) {

yd-user-feign/src/main/java/com/yd/user/feign/client/clientuser/ApiClientUserFeignClient.java

@@ -4,6 +4,7 @@ import com.yd.common.result.Result;
 import com.yd.user.feign.fallback.clientuser.ApiClientUserFeignFallbackFactory;
 import com.yd.user.feign.request.clientuser.ApiClientUserPageRequest;
 import com.yd.user.feign.response.clientuser.ApiClientUserDetailResponse;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,6 +25,7 @@ public interface ApiClientUserFeignClient {
      * @return
      */
     @PostMapping("/page")
+    @Operation(summary = "分页查询-客户端用户信息")
     Result page(@Validated @RequestBody ApiClientUserPageRequest request);
 
     /**
@@ -32,5 +34,6 @@ public interface ApiClientUserFeignClient {
      * @return
      */
     @GetMapping("/detail")
+    @Operation(summary = "详情-客户端用户信息")
     Result<ApiClientUserDetailResponse> detail(@NotBlank(message = "客户端用户表唯一业务ID不能为空") @RequestParam(value = "clientUserBizId") String clientUserBizId);
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/clientuser/ApiClientUserPageRequest.java

 package com.yd.user.feign.request.clientuser;
 
 import com.yd.common.dto.PageDto;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
@@ -9,20 +10,23 @@ public class ApiClientUserPageRequest extends PageDto {
     /**
      * 查询内容（姓名/手机号/邮箱，支持模糊搜索）
      */
+    @Schema(description = "查询内容（姓名/手机号/邮箱，支持模糊搜索）")
     private String queryContent;
 
     /**
      * 所属租户唯一业务ID
      */
+    @Schema(description = "所属租户唯一业务ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private String tenantBizId;
-
     /**
      * 所属项目唯一业务ID
      */
+    @Schema(description = "所属项目唯一业务ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private String projectBizId;
 
     /**
      * 用户唯一标识(sys_user系统用户表)
      */
+    @Schema(description = "用户唯一标识(sys_user系统用户表)")
     private String userBizId;
 }