From 0941e5e4b815081edce568000030990e3fb04491 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 18 九月 2024 10:39:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java
index 1a707e1..f47fe50 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java
@@ -1,6 +1,7 @@
package com.dy.pmsBase.role;
import com.dy.common.webUtil.QueryConditionVo;
+import com.dy.pmsGlobal.pojoBa.BaRole;
import lombok.*;
@Data
@@ -11,6 +12,6 @@
@Builder
public class QueryVo extends QueryConditionVo {
public String name;
- public boolean disable;
+ public boolean disabled;
public String dt;
}
--
Gitblit v1.8.0