From 455498f1454449bfd127a560eeb01ffff823a6ca Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 13:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/entity/OrganizationRelation.java | 29 ++++++-----------------------
1 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/moral/entity/OrganizationRelation.java b/src/main/java/com/moral/entity/OrganizationRelation.java
index bf98d83..7a48c3f 100644
--- a/src/main/java/com/moral/entity/OrganizationRelation.java
+++ b/src/main/java/com/moral/entity/OrganizationRelation.java
@@ -1,33 +1,16 @@
package com.moral.entity;
+import javax.persistence.Id;
+
+import lombok.Data;
+
+@Data
public class OrganizationRelation {
+ @Id
private Integer id;
private Integer parentId;
private Integer childId;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getParentId() {
- return parentId;
- }
-
- public void setParentId(Integer parentId) {
- this.parentId = parentId;
- }
-
- public Integer getChildId() {
- return childId;
- }
-
- public void setChildId(Integer childId) {
- this.childId = childId;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0