Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-02 539a7077cbf638a5aa9ae5e46c17be96daba7d9b

 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;