From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 24 九月 2024 16:09:50 +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 | 10 ++++++++++ 1 files changed, 10 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 9e1d4e5..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; -- Gitblit v1.7.1