From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期日, 27 七月 2025 09:06:31 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong --- UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbSpellOrderRule.java | 123 +++++++++++++++++++++++------------------ 1 files changed, 69 insertions(+), 54 deletions(-) diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbSpellOrderRule.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbSpellOrderRule.java index e64f97d..4f85839 100644 --- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbSpellOrderRule.java +++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbSpellOrderRule.java @@ -1,9 +1,11 @@ package com.stylefeng.guns.modular.system.model; -import com.baomidou.mybatisplus.enums.IdType; -import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; + import java.io.Serializable; /** @@ -16,56 +18,69 @@ */ @TableName("tb_spell_order_rule") public class TbSpellOrderRule extends Model<TbSpellOrderRule> { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - /** - * 公司id - */ - private Integer companyId; - /** - * 规则每个输入框为一个参数{"num1":1,"num2":2.3} - */ - private String content; - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getCompanyId() { - return companyId; - } - - public void setCompanyId(Integer companyId) { - this.companyId = companyId; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - @Override - protected Serializable pkVal() { - return this.id; - } - - @Override - public String toString() { - return "TbSpellOrderRule{" + - "id=" + id + - ", companyId=" + companyId + - ", content=" + content + - "}"; - } + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + /** + * 公司id + */ + private Integer companyId; + /** + * 规则每个输入框为一个参数{"num1":1,"num2":2.3} + */ + private String content; + /** + * 开通城市id + */ + @TableField("openCityId") + private Integer openCityId; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getCompanyId() { + return companyId; + } + + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + 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 "TbSpellOrderRule{" + + "id=" + id + + ", companyId=" + companyId + + ", content=" + content + + "}"; + } } -- Gitblit v1.7.1