From 8858d80de8896cb1e94ec809e9012e3eb575132a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 15:35:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 194e7b0..fea6a62 100644
--- a/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
+++ b/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.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 io.swagger.models.auth.In;
@@ -13,7 +14,10 @@
@Data
@ApiModel(value = "核算订单详情VO")
public class TOrderAccountVO {
-
+ @ApiModelProperty(value = "用户id")
+ private Integer userId;
+ @ApiModelProperty(value = "验光单id")
+ private Integer optometryId;
@ApiModelProperty(value = "用户信息-微信昵称")
private String name;
@ApiModelProperty(value = "用户信息-手机号")
@@ -28,7 +32,7 @@
@ApiModelProperty(value = "配镜处方")
private List<TOptometryDetail> optometryDetails;
@ApiModelProperty(value = "商品核算")
- private List<TOrderGoodsVO> orderGoods;
+ private List<TOrderGoods> orderGoods;
@ApiModelProperty(value = "门店名称")
private String storeName;
@ApiModelProperty(value = "商品小计")
--
Gitblit v1.7.1