From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 18:15:00 +0800
Subject: [PATCH] 合并代码
---
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