From 4372e6406222ce6b33f8c1c0703b460d39b5814e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 23 六月 2025 14:15:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreMemberForm.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreMemberForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreMemberForm.java
index 8a1e5d3..5b334dc 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreMemberForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreMemberForm.java
@@ -12,6 +12,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 鐢ㄦ埛鏉冮檺绠$悊(鍟嗗)琛ㄥ崟
  *
@@ -33,11 +35,15 @@
     @ApiModelProperty("瀵嗙爜")
     private String password;
 
+    @ApiModelProperty("鏄惁鏄鐞嗗憳")
+    private Boolean isSuper;
 
-    @NotBlank(message = "瑙掕壊涓嶈兘涓虹┖", groups = {Add.class, Update.class})
     @ApiModelProperty("瑙掕壊Json瀛楃涓�")
-    private String role;
 
+    private List<String> role;
+
+    @ApiModelProperty("閮ㄩ棬id")
+    private String departmentId;
 
     public static StoreMember getEntityByForm(@NonNull StoreMemberForm form, StoreMember entity) {
         if(entity == null) {

--
Gitblit v1.8.0