From 84f28e6743089c1147e078763de6eafe52d0dc31 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 二月 2025 14:15:40 +0800
Subject: [PATCH] 解决冲突
---
medicalWaste-system/src/main/java/com/sinata/system/domain/vo/SysRoleVO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/SysRoleVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/SysRoleVO.java
index d21c1ad..4ebe65f 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/SysRoleVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/SysRoleVO.java
@@ -24,6 +24,9 @@
@ApiModelProperty("可管理角色")
private String manageRoleStr;
+ @ApiModelProperty("可管理角色id")
+ private String manageRoleIdStr;
+
@ApiModelProperty("备注")
private String remark;
@@ -35,4 +38,7 @@
@ApiModelProperty("菜单id列表")
private List<Long> menuIds;
+
+ @ApiModelProperty("小程序角色标志")
+ private Integer appletFlag;
}
--
Gitblit v1.7.1