From bddad8b22f9b505274a8c2904d9d81efda89f497 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 20 十月 2022 13:08:36 +0800
Subject: [PATCH] Merge branch 'local_20221014' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderExportDTO.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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..3b60105 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
@@ -1,12 +1,12 @@
package com.panzhihua.common.model.dtos.shop;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
/**
* @ClasssName OrderShipDTO
@@ -19,26 +19,29 @@
@ApiModel("订单导出信息")
public class ComShopOrderExportDTO {
- @ApiModelProperty(value = "订单编号",example = "316356541616")
+ @ApiModelProperty(value = "订单编号", example = "316356541616")
private String orderNo;
@ApiModelProperty(value = "用户账号")
private String userAccount;
- @ApiModelProperty(value = "收货人",example = "张三")
+ @ApiModelProperty(value = "收货人", example = "张三")
private String receiverAccount;
- @ApiModelProperty(value = "收货人电话",example = "13123456789")
+ @ApiModelProperty(value = "收货人电话", example = "13123456789")
private String receiverPhone;
- @ApiModelProperty(value = "商品",example = "鞋")
+ @ApiModelProperty(value = "商品", example = "鞋")
private String goodsName;
- @ApiModelProperty(value = "订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)",example = "1")
+ @ApiModelProperty(value = "订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)", example = "1")
private Integer status;
- @ApiModelProperty(value = "下单时间-开始",example = "2021-04-01 19:58:41")
+ @ApiModelProperty(value = "下单时间-开始", example = "2021-04-01 19:58:41")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private String createAtStart;
- @ApiModelProperty(value = "下单时间-结束",example = "2021-04-18 19:58:54")
+ @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