From c030f12375d7e5d985847c662f0162b9254aef50 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 十月 2024 11:01:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java | 10 ++++++++++
1 files changed, 10 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..3375419 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")
@@ -68,5 +74,9 @@
@TableField(exist = false)
private String orderNum;
+ @TableField(exist = false)
+ private Integer goodType;
+
+
}
--
Gitblit v1.7.1