From b20a386a7b5905a070320e2cad116b6ae5c420c1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 六月 2025 19:17:59 +0800
Subject: [PATCH] 202506维护加盟商余额撤回
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
index 46bd01a..523bb87 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
@@ -72,7 +72,7 @@
private String recyclePerson;
@ApiModelProperty(value = "日期")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("order_date")
private Date orderDate;
@@ -82,11 +82,16 @@
private Integer state;
@ApiModelProperty(value = "导入时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("import_time")
private LocalDateTime importTime;
- @Excel(name = "日期")
+ @Excel(name = "日期(yyyy-MM-dd)")
@TableField(exist = false)
private String orderDateStr;
+ @ApiModelProperty(value = "数据类型 1=添加、导入数据 2=同步订单数据")
+ @TableField("data_type")
+ private Integer dataType;
+
}
--
Gitblit v1.7.1