Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 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;



   /**