From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:31:12 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java
index 7ec12ed..6047057 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java
@@ -96,4 +96,10 @@
 
     @ApiModelProperty(value = "订单扎数")
     private Integer saleNum;
+
+    @ApiModelProperty(value = "物流公司")
+    @DictTrans(target = "logisticsCompanyCodeStr", codeType = "LOGISTICS_COMPANY_CODE")
+    private String logisticsCompanyCode;
+
+    private String logisticsCompanyCodeStr;
 }

--
Gitblit v1.9.3