From 83c4dd24f674b5f2c3d10ab98d04e8562202449b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 21:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/dto/TOrderDTO.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/dto/TOrderDTO.java b/manage/src/main/java/com/jilongda/manage/dto/TOrderDTO.java
index 239258b..8509be0 100644
--- a/manage/src/main/java/com/jilongda/manage/dto/TOrderDTO.java
+++ b/manage/src/main/java/com/jilongda/manage/dto/TOrderDTO.java
@@ -2,6 +2,7 @@
import com.jilongda.manage.model.TOptometryDetail;
import com.jilongda.manage.model.TOrder;
+import com.jilongda.manage.model.TOrderGoods;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,5 +15,7 @@
@ApiModelProperty(value = "手动添加配镜处方使用")
private List<TOptometryDetail> optometryDetails;
+ @ApiModelProperty(value = "商品列表")
+ private List<TOrderGoods> orderGoods;
}
--
Gitblit v1.7.1