Merge branch 'master' of http://111.47.6.224:3000/udream-cxs/lift-server into master

lift-ud-service/src/main/java/cn/com/ty/lift/ud/neety/task/RedisRunner.java

@@ -50,7 +50,11 @@ public class RedisRunner implements CommandLineRunner {
             roomInfo.setCaseType(fistUserinfo.getCaseType());
             roomInfo.setAcceptStatus(fistUserinfo.getAcceptStatus());
             roomInfo.setExpression(fistUserinfo.getExpression());
-            roomInfo.setLastTime(fistUserinfo.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli());
+            if(null == fistUserinfo.getCreateTime()) {
+                roomInfo.setLastTime(null);
+            }else {
+                roomInfo.setLastTime(fistUserinfo.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli());
+            }
 
             List<UserInfo> users = new ArrayList<>();
             for (ChatSessionEntity chatSessionEntity : userList) {

lift-ud-service/src/main/java/cn/com/ty/lift/ud/neety/task/RoomInfo.java

@@ -17,6 +17,6 @@ public class RoomInfo {
     private Integer acceptStatus;
     private String expression;
     private String lastChat;
-    private long lastTime;
+    private Long lastTime;
     private List<UserInfo> userLIst;
 }