From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/entity/Role.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/entity/Role.java b/src/main/java/com/moral/entity/Role.java
index 4ec205b..7ba2ef6 100644
--- a/src/main/java/com/moral/entity/Role.java
+++ b/src/main/java/com/moral/entity/Role.java
@@ -1,8 +1,30 @@
package com.moral.entity;
+import java.util.Date;
+
+import javax.persistence.Id;
+
import lombok.Data;
@Data
public class Role {
- private String name;
+ @Id
+ private Integer id;
+
+ private String roleCode;
+
+ private String roleName;
+
+ private String isDelete;
+
+ private String roleRemark;
+
+ private Date createTime;
+
+ private String createUser;
+
+ private Date updateTime;
+
+ private String updateUser;
+
}
--
Gitblit v1.8.0