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

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

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

@@ -3,6 +3,8 @@
import java.util.Date;

import java.util.Map;



import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.Transient;



@@ -15,6 +17,7 @@
    * @mbggenerated  Thu Dec 07 15:18:16 CST 2017

    */

   @Id

   @GeneratedValue(strategy = GenerationType.IDENTITY)

   private Integer id;



   /**