From d1cc28c9fd86017f4a0a9013554bf1602fef8bc8 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 27 八月 2024 09:15:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
index 31c828a..88a0fee 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -49,7 +49,11 @@
*/
private String password;
-
+ /**
+ * 语言（1=简体中文，2=英语，3=法语）
+ */
+ @TableField("language")
+ private Integer language;
/**
* 姓
@@ -282,9 +286,9 @@
* 余额
*/
private BigDecimal balance;
- private BigDecimal commission;
- private BigDecimal backgroundBalance;
- private BigDecimal couponBalance;
+// private BigDecimal commission;
+// private BigDecimal backgroundBalance;
+// private BigDecimal couponBalance;
/**
* 活动总收入
--
Gitblit v1.7.1