From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailDTO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailDTO.java
index 287c915..414a955 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailDTO.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.web.response;
+import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.MemberRides;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,11 +14,13 @@
@Data
@ApiModel("璁㈠崟璇︽儏")
public class GoodsorderDetailDTO {
+ @ApiModelProperty(value = "璁㈠崟鏈韩淇℃伅")
+ private Goodsorder model;
@ApiModelProperty(value = "鏀粯鏄庣粏")
private List<PayOrderDTO> payOrderDTOList;
@ApiModelProperty(value = "楠戣璁板綍")
- private List<MemberRides> memberRidesList;
+ private List<BikeLogDTO> memberRidesList;
}
--
Gitblit v1.9.3