From 0430cf26ba8646c65ffb1d1a0fbdb191a8c29d74 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 17 十一月 2022 16:30:02 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java
index b212837..e89e7b1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java
@@ -1,14 +1,14 @@
package com.panzhihua.common.model.vos.shop;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @auther cedoo
@@ -26,8 +26,14 @@
@ApiModelProperty("店铺id")
private Long storeId;
+ @ApiModelProperty("店铺名称")
+ private String storeName;
+
@ApiModelProperty("用户id")
private Long userId;
+
+ @ApiModelProperty("用户账号")
+ private Long userName;
@ApiModelProperty("订单号")
private String orderNo;
@@ -46,6 +52,15 @@
@ApiModelProperty("订单收货人id")
private Long receiverId;
+
+ @ApiModelProperty("收货人")
+ private String receiverName;
+
+ @ApiModelProperty("电话")
+ private String receiverPhone;
+
+ @ApiModelProperty("商品")
+ private String goodsName;
@ApiModelProperty("订单总金额")
private BigDecimal totalAmount;
@@ -79,4 +94,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
+
+ private String address;
+
}
\ No newline at end of file
--
Gitblit v1.7.1