Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-06 f4ed03e33cd777996c697894c4075128546c3a74

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

@@ -4,6 +4,7 @@
import java.util.Map;



import javax.persistence.Id;

import javax.persistence.Transient;



import lombok.Data;



@@ -88,4 +89,7 @@
    */

   private String description;



    @Transient

   private AreaNames areaNames;



}