Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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

@@ -1,8 +1,10 @@
package com.moral.entity;



import java.util.Date;

import java.util.Map;



import javax.persistence.Id;

import javax.persistence.Transient;



import lombok.Data;



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

   private String description;



    @Transient

   private AreaNames areaNames;



}