From a3aa71fd0ba1b48fe52f080e8d2776f50c5ed514 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 27 四月 2021 11:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderExportDTO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderExportDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderExportDTO.java
index 11a0ed1..3eddddb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderExportDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderExportDTO.java
@@ -37,8 +37,11 @@
@ApiModelProperty(value = "下单时间-结束",example = "2021-04-18 19:58:54")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAtEnd;
- @ApiModelProperty(value = "订单ID", notes = "如果指定了订单ID，其它搜索条件将被忽略，只导出指定订单")
+ @ApiModelProperty(value = "订单ID-如果指定了订单ID，只导出指定订单，其它搜索条件将被忽略", notes = "")
private Long[] orderIds;
- @JsonIgnore
+ @ApiModelProperty(hidden = true)
private Long userId;
+ @ApiModelProperty(hidden = true)
+ private Long storeUserId;
+
}
--
Gitblit v1.7.1