From 1b899d65b9f9250c690f65673a974fdb3833582e Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期二, 18 六月 2024 14:32:36 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/DtoOrder.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/DtoOrder.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/DtoOrder.java index 407f244..f4ef320 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/DtoOrder.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/DtoOrder.java @@ -1,7 +1,6 @@ package com.dy.pipIrrSell.wechatpay.dto; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -21,15 +20,15 @@ * 鐧诲綍鎬両D锛岀敤鏉ヨ幏鍙杘penID */ @Schema(description = "鐧诲綍鎬両D", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @NotBlank(message = "鐧诲綍鎬両D涓嶈兘涓虹┖") - private String sessionId; + @NotNull(message = "鐧诲綍鎬両D涓嶈兘涓虹┖") + private Long sessionId; /** - * 铏氭嫙鍗$紪鍙凤紝澶栭敭锛岀敤鏉ヨ幏鍙栬櫄鎷熷崱浣欓 + * 铏氭嫙鍗D锛岀敤鏉ヨ幏鍙栬櫄鎷熷崱浣欓 */ @Schema(description = "铏氭嫙鍗$紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @NotNull(message = "铏氭嫙鍗$紪鍙蜂笉鑳戒负绌�") - private Long virtualId; + @NotNull(message = "铏氭嫙鍗D涓嶈兘涓虹┖") + private Long vcId; /** * 鍏呭�奸噾棰濋噾棰� -- Gitblit v1.8.0