From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb
---
oying-system/src/main/java/com/oying/modules/system/domain/UserMerchant.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/UserMerchant.java b/oying-system/src/main/java/com/oying/modules/system/domain/UserMerchant.java
new file mode 100644
index 0000000..7f5605f
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/UserMerchant.java
@@ -0,0 +1,47 @@
+package com.oying.modules.system.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.oying.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.bean.copier.CopyOptions;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+* @description /
+* @author lixin
+* @date 2025-06-16
+**/
+@Getter
+@Setter
+@TableName("sys_user_merchant")
+public class UserMerchant extends BaseEntity implements Serializable {
+
+ @NotNull(groups = Update.class)
+ @TableId(value = "manager_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "ID", hidden = true)
+ private Long managerId;
+
+ @ApiModelProperty(value = "商户id")
+ private Long merchantId;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ @NotBlank
+ @ApiModelProperty(value = "角色类型")
+ private String roleType;
+
+ @ApiModelProperty(value = "权限集（备用）")
+ private String permissions;
+
+ public void copy(UserMerchant source){
+ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+ }
+}
--
Gitblit v1.9.3