Merge branch 'pre'

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -244,7 +244,7 @@ public class DataUtil {
             }
 
             paramJson.addProperty("name", user.get("name").toString());
-            paramJson.addProperty("alias", user.get("nick_name").toString());
+            paramJson.addProperty("alias", user.get("nick_name")==null?"":user.get("nick_name").toString());
             paramJson.addProperty("extendId", user.get("id").toString());
             //获取时间戳
             long timestamp = System.currentTimeMillis();