From d94e7d6bbf23698c27147a60ee866c64b2d43775 Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期四, 14 十一月 2024 09:37:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4 --- src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java index 3a34db2..9648ec8 100644 --- a/src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java +++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java @@ -85,4 +85,15 @@ @ApiModelProperty(value = "快递单号") private String deliveryNo;//快递单号 + + @ApiModelProperty(value = "特殊需求") + @DictTrans(target = "specialNeedsStr", codeType = "SPEC_REQ") + private String specialNeeds; + private String specialNeedsStr; + + @ApiModelProperty(value = "留言") + private String remarks; + + @ApiModelProperty(value = "订单扎数") + private Integer saleNum; } -- Gitblit v1.9.3