From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorUser.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorUser.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorUser.java
index 6ccfbc2..0c0aa8d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorUser.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorUser.java
@@ -1,5 +1,8 @@
package com.dsh.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -8,16 +11,30 @@
@TableName("t_operator_user")
@Data
public class OperatorUser {
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
- private String province;
- private Integer provinceCode;
- private String city;
- private Integer cityCode;
+ @TableField(value = "userId")
private Integer userId;
- private Integer platform;
- private Integer type;
- private BigDecimal proportion;
- private Integer state;
- private Integer status;
+ @TableField(value = "alipay")
+ private String alipay;
+ @TableField(value = "alipayProportion")
+ private String alipayProportion;
+ @TableField(value = "alipayNum")
+ private String alipayNum;
+ @TableField(value = "wechat")
+ private String wechat;
+ @TableField(value = "wechatProportion")
+ private String wechatProportion;
+ @TableField(value = "wechatNum")
+ private String wechatNum;
+ @TableField(value = "alipayType")
+ private Integer alipayType;
+ @TableField(value = "wechatType")
+ private Integer wechatType;
+ @TableField(value = "operatorId")
private Integer operatorId;
+ @TableField(value = "alipayAudit")
+ private Integer alipayAudit;
+ @TableField(value = "wechatAudit")
+ private Integer wechatAudit;
}
--
Gitblit v1.7.1