From b2a5e4be739b232876b87e65ed70fa5186943d1e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 09 三月 2022 09:29:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFundsExportDTO.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFundsExportDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFundsExportDTO.java
index daa7d28..ef90879 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFundsExportDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFundsExportDTO.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,16 +19,16 @@
@ApiModel("订单导出信息")
public class ComShopFundsExportDTO {
- @ApiModelProperty(value = "订单编号",example = "316356541616")
+ @ApiModelProperty(value = "订单编号", example = "316356541616")
private String orderNo;
- @ApiModelProperty(value = "支付时间-开始",example = "2021-03-18 19:59:06")
+ @ApiModelProperty(value = "支付时间-开始", example = "2021-03-18 19:59:06")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTimeStart;
- @ApiModelProperty(value = "支付时间-结束",example = "2021-04-18 19:59:14")
+ @ApiModelProperty(value = "支付时间-结束", example = "2021-04-18 19:59:14")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTimeEnd;
@ApiModelProperty(value = "订单ID-如果指定了订单ID，只导出指定订单，其它搜索条件将被忽略", notes = "如果指定了订单ID，其它搜索条件将被忽略，只导出指定订单")
private Long[] orderIds;
- @JsonIgnore
+ @ApiModelProperty(hidden = true)
private Long userId;
}
--
Gitblit v1.7.1