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

xufenglei

2018-03-26 b4aa377b5e7898cd2ef018cc385a19af67a56839

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

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



import javax.persistence.Id;

import javax.persistence.Transient;



import lombok.Data;



@@ -116,4 +117,7 @@
     * @mbg.generated Wed Dec 27 16:21:08 CST 2017

     */

    private String nickName;

    
    @Transient

    private Organization organization;

}