diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java
index 18fa1797..5b65f3ff 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java
@@ -56,7 +56,7 @@ public class TcJgdw extends BaseEntity
 
     /** 是否关注重点 */
     @ApiModelProperty(value = "是否关注重点")
-    @Excel(name = "是否关注重点")
+    @Excel(name = "是否关注重点",readConverterExp = "1=是,2=否",combo ="1=是,2=否" )
     private String isFocus;
 
     /** 等保级别 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java
index 54c19d9f..bef9b232 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java
@@ -2,10 +2,14 @@ package com.ruoyi.tcZz.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 舆情信息量统计明細对象 tc_yqxxltj
@@ -13,6 +17,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-12
  */
+@Data
+@ApiModel("舆情信息量统计明細对象")
 public class TcYqxxltj extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -41,103 +47,13 @@ public class TcYqxxltj extends BaseEntity
     private String source;
 
     /** 时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date dateTime;
 
     /** 内容 */
     @Excel(name = "内容")
     private String content;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(String areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public String getAreaId() 
-    {
-        return areaId;
-    }
-    public void setIsStatus(Long isStatus) 
-    {
-        this.isStatus = isStatus;
-    }
-
-    public Long getIsStatus() 
-    {
-        return isStatus;
-    }
-    public void setType(Long type) 
-    {
-        this.type = type;
-    }
-
-    public Long getType() 
-    {
-        return type;
-    }
-    public void setTitle(String title) 
-    {
-        this.title = title;
-    }
-
-    public String getTitle() 
-    {
-        return title;
-    }
-    public void setSource(String source) 
-    {
-        this.source = source;
-    }
-
-    public String getSource() 
-    {
-        return source;
-    }
-    public void setDateTime(Date dateTime) 
-    {
-        this.dateTime = dateTime;
-    }
-
-    public Date getDateTime() 
-    {
-        return dateTime;
-    }
-    public void setContent(String content) 
-    {
-        this.content = content;
-    }
-
-    public String getContent() 
-    {
-        return content;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("isStatus", getIsStatus())
-            .append("type", getType())
-            .append("title", getTitle())
-            .append("source", getSource())
-            .append("dateTime", getDateTime())
-            .append("content", getContent())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }