From 2aae6068bbf1aff1ffb2813098553ac632d5002b Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 10 九月 2024 16:24:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItem4CheckDTO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItem4CheckDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItem4CheckDTO.java
index 1e02cee..f0b2e4d 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItem4CheckDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItem4CheckDTO.java
@@ -37,7 +37,7 @@
private String flowerLevelStr;
@ApiModelProperty(value = "订单商品状态")
- @DictTrans(target = "statusStr", codeType = "CHECK_OPERATE")
+ @DictTrans(target = "statusStr", codeType = "ORDER_ITEM_STATUS")
private String status;
private String statusStr;
--
Gitblit v1.9.3