From f869b1369002566b1e1df29d11faeecb10e3b262 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 20:38:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/BalanceQuery.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/BalanceQuery.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/BalanceQuery.java
index e29348b..b3517cb 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/BalanceQuery.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/BalanceQuery.java
@@ -1,5 +1,6 @@
package com.ruoyi.account.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,8 +15,9 @@
private String userPhone;
@ApiModelProperty("类型:1充值2提现3红包4分佣5商城购物")
private Integer changeType;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDate localDate1;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDate localDate2;
private Integer pageNum;
private Integer pageSize;
--
Gitblit v1.7.1