From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
index f8d11a1..013cbf3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
@@ -27,18 +27,24 @@
private String receiverPhone;
@ApiModelProperty(value = "商品",example = "鞋")
private String goodsName;
+ @ApiModelProperty(value = "店铺名称",example = "小二的店")
+ private String storeName;
@ApiModelProperty(value = "订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)",example = "1")
private Integer status;
- @ApiModelProperty(value = "下单时间-开始",example = "1")
+ @ApiModelProperty(value = "下单时间-开始",example = "2021-4-10 10:38:25")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private String createAtStart;
- @ApiModelProperty(value = "下单时间-结束",example = "1")
+ @ApiModelProperty(value = "下单时间-结束",example = "2021-4-20 10:38:29")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAtEnd;
@ApiModelProperty(value = "分页-当前页数",example = "1", required = true)
private Long pageNum;
@ApiModelProperty(value = "分页-每页记录数",example = "10", required = true)
private Long pageSize;
- @JsonIgnore
+ @ApiModelProperty(hidden = true)
private Long userId;
+ @ApiModelProperty(hidden = true)
+ private Long storeId;
+ @ApiModelProperty(hidden = true)
+ private Long storeUserId;
}
--
Gitblit v1.7.1