Merge remote-tracking branch 'origin/master'

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/THiddenTroubleInfoSController.java

 package com.zehong.web.controller.supervise;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import com.zehong.common.core.domain.entity.SysUser;
@@ -85,6 +87,9 @@ public class THiddenTroubleInfoSController extends BaseController
         //获取用户信息
         SysUser user = SecurityUtils.getLoginUser().getUser();
         tHiddenTroubleInfo.setBeyondEnterpriseId(user.getDeptId());
+        tHiddenTroubleInfo.setReportPerson(user.getNickName());
+        SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
+        tHiddenTroubleInfo.setReportTime(dateTime.format(new Date()));
         return toAjax(tHiddenTroubleInfoService.insertTHiddenTroubleInfo(tHiddenTroubleInfo));
     }
 

gassafetyprogress-system/src/main/java/com/zehong/system/domain/THiddenTroubleInfo.java

@@ -55,7 +55,7 @@ public class THiddenTroubleInfo extends BaseEntity
     private String hiddenTroubleDescribe;
 
     /** 上报时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "上报时间", width = 30, dateFormat = "yyyy-MM-dd")
     private String reportTime;