Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

xufenglei

2018-03-26 b4aa377b5e7898cd2ef018cc385a19af67a56839

 src/main/java/com/moral/entity/OrganizationRelation.java

@@ -1,9 +1,12 @@
package com.moral.entity;



import javax.persistence.Id;



import lombok.Data;



@Data

public class OrganizationRelation {

   @Id

    private Integer id;



    private Integer parentId;