解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/IndexDto.java

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
 import lombok.Data;
+import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 
@@ -42,8 +43,17 @@ public class IndexDto {
     private String displayName;
     private String pictureName;
     private String title;
+    private String timeString="";
     //对于创建时间进行处理用于列表排序
     public String getTimeString(){
-        return  getCreatedTime().replace("-","").replace(" ","").replace(":","");
+        String timeString = "";
+        if(!ObjectUtils.isEmpty(getCreatedTime())){
+            timeString =getCreatedTime().replace("-","").replace(" ","").replace(":","");
+        }
+        return  timeString;
     }
+    public void setTimeString(String timeString){
+        this.timeString = timeString;
+    }
+
 }