From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/system/entity/SysRole.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/system/entity/SysRole.java b/ycl-pojo/src/main/java/com/ycl/system/entity/SysRole.java
index 36bbebe..ddc3aba 100644
--- a/ycl-pojo/src/main/java/com/ycl/system/entity/SysRole.java
+++ b/ycl-pojo/src/main/java/com/ycl/system/entity/SysRole.java
@@ -10,7 +10,7 @@
 
 /**
  * 瑙掕壊琛� sys_role
- * 
+ *
  * @author ruoyi
  */
 public class SysRole extends BaseEntity
@@ -42,7 +42,7 @@
     private String status;
 
     /** 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */
-    private String delFlag;
+    private Integer delFlag;
 
     /** 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦� */
     private boolean flag = false;
@@ -161,12 +161,12 @@
         this.status = status;
     }
 
-    public String getDelFlag()
+    public Integer getDelFlag()
     {
         return delFlag;
     }
 
-    public void setDelFlag(String delFlag)
+    public void setDelFlag(Integer delFlag)
     {
         this.delFlag = delFlag;
     }

--
Gitblit v1.8.0