From 3c99ce947f25a2dcbae14e78276df77978d412ca Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 26 九月 2024 16:03:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
index ac10872..1b5f369 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
@@ -32,11 +32,16 @@
@ApiModelProperty(value = "主键")
@TableId("id")
private Long id;
+ @TableField(exist = false)
+ private String uid;
@ApiModelProperty(value = "流水号")
@TableField("code")
private String code;
+ @ApiModelProperty(value = "对应跳转订单号")
+ @TableField("order_code")
+ private String orderCode;
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
private Long appUserId;
@@ -55,6 +60,7 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime createTime;
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
--
Gitblit v1.7.1