From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompanyCity.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompanyCity.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompanyCity.java
index d1cce29..dc89be0 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompanyCity.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompanyCity.java
@@ -38,6 +38,10 @@
      */
     private Integer areaCode;
     /**
+     * 城市id
+     */
+    private Integer cityId;
+    /**
      * 1=正常,2=删除
      */
     private Integer state;
@@ -91,6 +95,14 @@
         this.state = state;
     }
 
+    public Integer getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(Integer cityId) {
+        this.cityId = cityId;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;

--
Gitblit v1.7.1