From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOperator.java | 19 ++++++++++++++++++-
1 files changed, 18 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..e3d98a7 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
@@ -30,6 +30,16 @@
private Integer id;
private String name;
+ /**
+ * 微信商户号
+ */
+ @TableField("merchantNumber")
+ private String merchantNumber;
+ /**
+ * 微信商户全称
+ */
+ @TableField("merchantName")
+ private String merchantName;
@TableField("userId")
private Integer userId;
@@ -38,7 +48,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