问题修改

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java

@@ -73,6 +73,7 @@ public class BackCsDeviceDetails {
     private Date createTime;
 
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
     @ApiModelProperty(value = "创建人")

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml

@@ -150,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mdi.manage_type AS manageType,
         mdi.code AS devCode,
         mdi.device_count AS useNum,
+        cdc.update_time AS updateTime,
         1 AS devType,
         mdi.type_id AS typeId,
         mdi.ma_id AS id
@@ -194,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tl.manage_mode as manageType,
         IFNULL(tl.tool_code,'/') as devCode,
         IFNULL(tl.in_num, 0) as useNum,
+        cdc.update_time AS updateTime,
         2 as devType,
         tl.type_id as typeId,
         tl.id as id
@@ -206,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tool_type tt3 ON tt2.parent_id = tt3.type_id
         LEFT JOIN tool_type tt4 ON tt3.parent_id = tt4.type_id
         <where>
-             cdc.del_flag = '0'
+            cdc.del_flag = '0'
             <if test="devType!=null and devType!=''">
                 AND cdc.dev_type = #{devType}
             </if>
@@ -240,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tl.manage_mode as manageType,
         IFNULL(tl.tool_code,'/') as devCode,
         IFNULL(tl.in_num, 0) as useNum,
+        cdc.update_time AS updateTime,
         2 as devType,
         tl.type_id as typeId,
         tl.id as id