From 44311853fa68f04db11d341bd374a4ac9b5ea567 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 07 十月 2023 17:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOperator.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOperator.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOperator.java
index cb188da..9e1d4e5 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOperator.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOperator.java
@@ -38,7 +38,14 @@
      * 1 全国 2指定
      */
     private Integer type;
-
+    /**
+     * 商户绑定状态1否2是
+     */
+    private Integer status;
+    /**
+     * 运营商状态1正常 2冻结 3删除
+     */
+    private Integer state;
 
     @Override
     protected Serializable pkVal() {

--
Gitblit v1.7.1