From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +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 | 5 +++++
1 files changed, 5 insertions(+), 0 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 e3d98a7..506795c 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
@@ -36,6 +36,11 @@
@TableField("merchantNumber")
private String merchantNumber;
/**
+ * 支付宝商户号
+ */
+ @TableField("merchantNumberAli")
+ private String merchantNumberAli;
+ /**
* 微信商户全称
*/
@TableField("merchantName")
--
Gitblit v1.7.1