From 5227e59f6728dcd2faca6372b9f5701cf5a1c40c Mon Sep 17 00:00:00 2001
From: zhaoxianglong <you@example.com>
Date: Mon, 29 Jul 2024 17:42:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zc/business/domain/DcDevice.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
index 668c6835..9976584f 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
@@ -62,13 +62,13 @@ public class DcDevice {
     @Excel(name = "所属网段")
     private String networkSegment;
     @ApiModelProperty("设备图片")
-    @Excel(name = "设备图片",cellType = ColumnType.IMAGE)
+    @Excel(name = "设备图片", cellType = ColumnType.IMAGE)
     private String deviceImg;
     @ApiModelProperty("安装日期")
-    @Excel(name = "安装日期",dateFormat = "yyyy-MM-dd")
+    @Excel(name = "安装日期", dateFormat = "yyyy-MM-dd")
     private Date installationDate;
     @ApiModelProperty("生产日期")
-    @Excel(name = "生产日期",dateFormat = "yyyy-MM-dd")
+    @Excel(name = "生产日期", dateFormat = "yyyy-MM-dd")
     private Date productionDate;
     @ApiModelProperty("使用年限")
     @Excel(name = "使用年限")
@@ -98,10 +98,10 @@ public class DcDevice {
     @Excel(name = "范围桩号")
     private String stakeMarkRange;
     @ApiModelProperty("创建时间")
-    @Excel(name = "创建时间")
+    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     @ApiModelProperty("修改时间")
-    @Excel(name = "修改时间")
+    @Excel(name = "修改时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
     @ApiModelProperty("子类型")
     @Excel(name = "子类型", readConverterExp = "1-1=高清网络枪型固定摄像机,1-2=高清网络球形摄像机,1-3=桥下高清网络球形摄像机,1-4=360°全景摄像机,1-5=180°全景摄像机,2-1=门架式可变信息标志,2-2=站前可变信息标志,2-3=雨棚可变信息标志,2-4=站前悬臂式可变信息标")
@@ -117,14 +117,14 @@ public class DcDevice {
     private String manufacturer;
 
 
-
     public Integer stakeMarkToInt() {
         return StakeMarkUtils.stakeMarkToInt(stakeMark);
     }
-    public String getRealType(){
-        if(ObjectUtils.isEmpty(this.childType)){
+
+    public String getRealType() {
+        if (ObjectUtils.isEmpty(this.childType)) {
             return this.deviceType;
-        }else{
+        } else {
             return this.childType;
         }
     }