From e013e819f7d544c5c8c59e69ce42c3d10e2215e6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 31 十二月 2024 15:45:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java b/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
index 65e8911..1eb1a5d 100644
--- a/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
+++ b/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
@@ -4,6 +4,7 @@
import com.jilongda.manage.model.TOptometryDetail;
import com.jilongda.manage.model.TOrder;
import com.jilongda.manage.model.TOrderGoods;
+import com.jilongda.manage.model.TOrderItems;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
@@ -47,7 +48,7 @@
@ApiModelProperty(value = "支付方式")
private String payType;
@ApiModelProperty(value = "确认核算后的支付方式和支付金额")
- private String confirmPayType;
+ private List<TOrderItems> orderItems;
@ApiModelProperty(value = "实收金额")
private BigDecimal realPayMoney;
@ApiModelProperty(value = "手续费扣除")
--
Gitblit v1.7.1