diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HiddenDanger.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HiddenDanger.java
index 6e95965..eb6f807 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HiddenDanger.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HiddenDanger.java
@@ -40,7 +40,7 @@ public class HiddenDanger extends BaseEntity
 
     /** 上报日期 */
     @ApiModelProperty(value = "上报日期")
-    private Date submitDate;
+    private String submitDate;
 
     /** 上报人id */
     @ApiModelProperty(value = "上报人id")
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml
index 60d3d4f..5995ad2 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml
@@ -22,17 +22,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectHiddenDangerVo">
-        select id, name, details, risk_id, submit_date, submit_person_id, submit_enterprise_id, reform_measures, reform_status, exceed_time_limit_status, enterprise_id, person_id, remarks, rectification_period from hidden_danger
+        select id, name, details, risk_id riskId, DATE_FORMAT(submit_date,'%Y-%m-%d %H:%i:%S') submitDate, submit_person_id submitPersonId, submit_enterprise_id submitEnterpriseId, reform_measures reformMeasures, reform_status reformStatus, exceed_time_limit_status exceedTimeLimitStatus, enterprise_id enterpriseId, person_id personId, remarks, rectification_period rectificationPeriod from hidden_danger
     </sql>
 
-    <select id="selectHiddenDangerList" parameterType="com.hbt.safety.supervision.pojo.HiddenDanger" resultMap="HiddenDangerResult">
+    <select id="selectHiddenDangerList" parameterType="com.hbt.safety.supervision.pojo.HiddenDanger" resultType="HiddenDanger">
         <include refid="selectHiddenDangerVo"/>
         <where>  
         </where>
     </select>
 
     <sql id="selectHiddenDanger">
-        select distinct(a.id) id, a.name, a.details, a.risk_id riskId, a.submit_date submitDate, a.reform_measures reformMeasures, a.reform_status reformStatus, a.exceed_time_limit_status exceedTimeLimitStatus, a.enterprise_id enterpriseId, a.person_id personId, a.remarks remarks, a.rectification_period rectificationPeriod,
+        select distinct(a.id) id, a.name, a.details, a.risk_id riskId, DATE_FORMAT(a.submit_date,'%Y-%m-%d %H:%i:%S') submitDate, a.reform_measures reformMeasures, a.reform_status reformStatus, a.exceed_time_limit_status exceedTimeLimitStatus, a.enterprise_id enterpriseId, a.person_id personId, a.remarks remarks, a.rectification_period rectificationPeriod,
         b.name as enterprise,
         p.name as person,
         r.name as riskName,