From b646898adf3f2ad119dd9fd1c7c01d7f0742bf97 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 31 七月 2025 11:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtThirdOrderPageDto.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtThirdOrderPageDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtThirdOrderPageDto.java
index e58fe34..d0b228a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtThirdOrderPageDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtThirdOrderPageDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.order.domain.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.api.domain.dto.MgtPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,17 +17,21 @@
private Long shopId;
@ApiModelProperty(value = "下单时间-范围开始")
- private LocalDateTime createTimeBegin;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String createTimeBegin;
@ApiModelProperty(value = "下单时间-范围结束")
- private LocalDateTime createTimeEnd;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String createTimeEnd;
- @ApiModelProperty(value = "订单来源1.店铺商品2.平台秒杀活动3.线下创建")
- private Integer orderFrom;
+ @ApiModelProperty(value = "订单来源5.美团6.抖音7.快手8.小鹅云")
+ private String orderFrom;
@ApiModelProperty(value = "核销时间-范围开始")
- private LocalDateTime useTimeBegin;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String useTimeBegin;
@ApiModelProperty(value = "核销时间-范围结束")
- private LocalDateTime useTimeEnd;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String useTimeEnd;
@ApiModelProperty(value = "keyword转换用户ids",hidden = true)
--
Gitblit v1.7.1