From 935b27a40c549f3ebc15e7e9654cdfd01e8eab13 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 04 Jun 2024 11:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into zyqs-0502
---
src/main/java/com/nq/vo/user/UserOptionLogVO.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nq/vo/user/UserOptionLogVO.java b/src/main/java/com/nq/vo/user/UserOptionLogVO.java
index e68dfc0..50e0922 100644
--- a/src/main/java/com/nq/vo/user/UserOptionLogVO.java
+++ b/src/main/java/com/nq/vo/user/UserOptionLogVO.java
@@ -5,24 +5,25 @@
import org.joda.time.DateTime;
import java.math.BigDecimal;
+import java.util.Date;
@Data
public class UserOptionLogVO {
private Integer id;
-
+ //操作金额
private BigDecimal money;
-
+ //类型，0扣款，1入款
private Integer type;
-
+ //用户id
private Integer userId;
-
+ //资产id
private Integer userAccectId;
-
- private DateTime createTime;
-
+ //操作时间
+ private Date createTime;
+ //资产账户类型
private String userAccectType;
-
+ //用户名
private String userName;
}
--
Gitblit v1.9.3