From 4a635f80434e5537b650fdad8da18bdeac3b8ca6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 六月 2025 16:21:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java
index f79abb4..ebe73e6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java
@@ -1,15 +1,22 @@
package com.ruoyi.order.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
+import java.util.List;
+
@Data
+@ApiModel("支付订单查询dto")
public class PayOrderQueryDto extends BasePage {
@ApiModelProperty("订单编号")
private String code;
+ @ApiModelProperty("开票跳转-订单ids数组")
+ private List<String> ids;
@ApiModelProperty("1充电订单2购物订单3vip订单4停车订单")
private Integer type;
@ApiModelProperty("手机号")
@@ -18,8 +25,10 @@
private Integer isRefund;
@ApiModelProperty("下单时间1")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime1;
@ApiModelProperty("下单时间2")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime2;
}
--
Gitblit v1.7.1