From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java | 119 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 67 insertions(+), 52 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java
index 044d934..dc75989 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java
@@ -1,9 +1,11 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
/**
@@ -16,56 +18,69 @@
*/
@TableName("t_sys_timeout_money")
public class TSysTimeoutMoney extends Model<TSysTimeoutMoney> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 超时分钟数
- */
- private Integer timeOut;
- /**
- * 扣除费用百分比
- */
- private Double deductMoney;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getTimeOut() {
- return timeOut;
- }
-
- public void setTimeOut(Integer timeOut) {
- this.timeOut = timeOut;
- }
-
- public Double getDeductMoney() {
- return deductMoney;
- }
-
- public void setDeductMoney(Double deductMoney) {
- this.deductMoney = deductMoney;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysTimeoutMoney{" +
- "id=" + id +
- ", timeOut=" + timeOut +
- ", deductMoney=" + deductMoney +
- "}";
- }
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 超时分钟数
+ */
+ private Integer timeOut;
+ /**
+ * 扣除费用百分比
+ */
+ private Double deductMoney;
+ /**
+ * 开通城市id
+ */
+ @TableField("openCityId")
+ private Integer openCityId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getTimeOut() {
+ return timeOut;
+ }
+
+ public void setTimeOut(Integer timeOut) {
+ this.timeOut = timeOut;
+ }
+
+ public Double getDeductMoney() {
+ return deductMoney;
+ }
+
+ public void setDeductMoney(Double deductMoney) {
+ this.deductMoney = deductMoney;
+ }
+
+ public Integer getOpenCityId() {
+ return openCityId;
+ }
+
+ public void setOpenCityId(Integer openCityId) {
+ this.openCityId = openCityId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysTimeoutMoney{" +
+ "id=" + id +
+ ", timeOut=" + timeOut +
+ ", deductMoney=" + deductMoney +
+ "}";
+ }
}
--
Gitblit v1.7.1