From ab0637e981ab4c85120ccde35ee24ec4abbe3e24 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 17 Oct 2025 17:20:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin
---
oying-system/src/main/java/com/oying/modules/system/domain/UserMerchant.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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
index 3bcd226..7f5605f 100644
--- 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
@@ -1,10 +1,12 @@
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;
@@ -21,16 +23,19 @@
@TableName("sys_user_merchant")
public class UserMerchant extends BaseEntity implements Serializable {
- @TableId(value = "merchant_id")
+ @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;
- @TableId(value = "user_id")
@ApiModelProperty(value = "用户id")
private Long userId;
@NotBlank
- @ApiModelProperty(value = "角色类型（OWNER、ADMIN、FINANCE、OPERATOR）")
+ @ApiModelProperty(value = "角色类型")
private String roleType;
@ApiModelProperty(value = "权限集（备用）")
--
Gitblit v1.9.3