From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemConfig.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemConfig.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemConfig.java
index ac50b8d..6d5888c 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemConfig.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemConfig.java
@@ -1,5 +1,6 @@
 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;
@@ -32,6 +33,11 @@
      * 内容
      */
     private String content;
+    /**
+     * 分公司id
+     */
+    @TableField("companyId")
+    private Integer companyId;
 
 
     public Integer getId() {
@@ -58,6 +64,14 @@
         this.content = content;
     }
 
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -66,9 +80,9 @@
     @Override
     public String toString() {
         return "TSystemConfig{" +
-        "id=" + id +
-        ", type=" + type +
-        ", content=" + content +
-        "}";
+                "id=" + id +
+                ", type=" + type +
+                ", content=" + content +
+                "}";
     }
 }

--
Gitblit v1.7.1