Browse Source

线路下拉

hexiao 2 years ago
parent
commit
d00615963b

+ 2 - 2
.idea/compiler.xml

@@ -7,10 +7,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="base-admin" />
-        <module name="hazard-admin" />
         <module name="hazard-sdk" />
         <module name="business-service" />
+        <module name="hazard-admin" />
+        <module name="base-admin" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>

+ 3 - 1
business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmResp.java

@@ -2,6 +2,7 @@ package com.ozs.service.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -70,6 +71,7 @@ public class MsgAlarmResp implements Serializable {
     /**
      * 解除时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date releasedTime;
-    
+
 }