From 23909c44f1ed6cfeba17cb1e5c070d4e639d36f7 Mon Sep 17 00:00:00 2001 From: 18278715334 <18278715334@163.com> Date: Mon, 5 Jan 2026 14:34:58 +0800 Subject: [PATCH] Resolve merge conflicts --- internal/domains/api/dto/api_request_dto.go | 2 +- .../domains/api/services/processors/ivyz/ivyz9h2m_processor.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/domains/api/dto/api_request_dto.go b/internal/domains/api/dto/api_request_dto.go index c7c4433..bc91e4d 100644 --- a/internal/domains/api/dto/api_request_dto.go +++ b/internal/domains/api/dto/api_request_dto.go @@ -647,7 +647,7 @@ type QYGL2S0WReq struct { type QYGL66SLReq struct { EntCode string `json:"ent_code" validate:"omitempty,validUSCI"` AuthDate string `json:"auth_date" validate:"required,validAuthDate"` - EntName string `json:"ent_name" validate:"omitempty,min=1,validEnterpriseName"` + EntName string `json:"ent_name" validate:"required,min=1,validEnterpriseName"` AuthAuthorizeFileCode string `json:"auth_authorize_file_code" validate:"required"` } type JRZQ2F8AReq struct { diff --git a/internal/domains/api/services/processors/ivyz/ivyz9h2m_processor.go b/internal/domains/api/services/processors/ivyz/ivyz9h2m_processor.go index c9e9286..77f3711 100644 --- a/internal/domains/api/services/processors/ivyz/ivyz9h2m_processor.go +++ b/internal/domains/api/services/processors/ivyz/ivyz9h2m_processor.go @@ -23,7 +23,7 @@ func ProcessIVYZ9H2MRequest(ctx context.Context, params []byte, deps *processors // 构建请求参数 reqData := map[string]interface{}{ - "idNo": paramsDto.IDCard, + "idNo": paramsDto.IDNo, "name": paramsDto.Name, }