From ecc4e57b4f7c6ecfd6823704688ee786b3350b1f Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 02 十二月 2024 11:06:13 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai 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