From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/entity/BaseRole.java |   88 ++++----------------------------------------
 1 files changed, 8 insertions(+), 80 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/entity/BaseRole.java b/src/main/java/com/nanometer/smartlab/entity/BaseRole.java
index d535732..c289243 100644
--- a/src/main/java/com/nanometer/smartlab/entity/BaseRole.java
+++ b/src/main/java/com/nanometer/smartlab/entity/BaseRole.java
@@ -1,6 +1,8 @@
 package com.nanometer.smartlab.entity;
 
 import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang.StringUtils;
 
 import java.io.Serializable;
@@ -11,9 +13,10 @@
 /**
  * Created by johnny on 17/11/18.
  */
+@Setter
+@Getter
 public class BaseRole implements Serializable {
-
-    private String id;
+    private Long id;
     private String name;
     private String memo;
     private ValidFlag validFlag;
@@ -21,69 +24,11 @@
     private Timestamp updateTime;
     private String btnPermission;
     private String userPermission;
+
+    //非数据库字段
     private List<String> btnPermissions;
+    private List<Long> pageIdList;
 
-    private List<String> pageIdList;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public ValidFlag getValidFlag() {
-        return validFlag;
-    }
-
-    public void setValidFlag(ValidFlag validFlag) {
-        this.validFlag = validFlag;
-    }
-
-    public Timestamp getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Timestamp createTime) {
-        this.createTime = createTime;
-    }
-
-    public Timestamp getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Timestamp updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public List<String> getPageIdList() {
-        return pageIdList;
-    }
-
-    public void setPageIdList(List<String> pageIdList) {
-        this.pageIdList = pageIdList;
-    }
-
-    public String getBtnPermission() {
-        return btnPermission;
-    }
 
     public void setBtnPermission(String btnPermission) {
         if (StringUtils.isNotBlank(btnPermission)) {
@@ -91,22 +36,5 @@
         }
         this.btnPermission = btnPermission;
     }
-
-    public String getUserPermission() {
-        return userPermission;
-    }
-
-    public void setUserPermission(String userPermission) {
-        this.userPermission = userPermission;
-    }
-
-    public List<String> getBtnPermissions() {
-        return btnPermissions;
-    }
-
-    public void setBtnPermissions(List<String> btnPermissions) {
-        this.btnPermissions = btnPermissions;
-    }
-
 
 }

--
Gitblit v1.9.2