问题修改
This commit is contained in:
parent
6abbc18578
commit
5b44b833ef
|
|
@ -73,6 +73,7 @@ public class BackCsDeviceDetails {
|
||||||
private Date createTime;
|
private Date createTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "更新时间")
|
@ApiModelProperty(value = "更新时间")
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
private Date updateTime;
|
private Date updateTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建人")
|
@ApiModelProperty(value = "创建人")
|
||||||
|
|
|
||||||
|
|
@ -150,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
mdi.manage_type AS manageType,
|
mdi.manage_type AS manageType,
|
||||||
mdi.code AS devCode,
|
mdi.code AS devCode,
|
||||||
mdi.device_count AS useNum,
|
mdi.device_count AS useNum,
|
||||||
|
cdc.update_time AS updateTime,
|
||||||
1 AS devType,
|
1 AS devType,
|
||||||
mdi.type_id AS typeId,
|
mdi.type_id AS typeId,
|
||||||
mdi.ma_id AS id
|
mdi.ma_id AS id
|
||||||
|
|
@ -194,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
tl.manage_mode as manageType,
|
tl.manage_mode as manageType,
|
||||||
IFNULL(tl.tool_code,'/') as devCode,
|
IFNULL(tl.tool_code,'/') as devCode,
|
||||||
IFNULL(tl.in_num, 0) as useNum,
|
IFNULL(tl.in_num, 0) as useNum,
|
||||||
|
cdc.update_time AS updateTime,
|
||||||
2 as devType,
|
2 as devType,
|
||||||
tl.type_id as typeId,
|
tl.type_id as typeId,
|
||||||
tl.id as id
|
tl.id as id
|
||||||
|
|
@ -240,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
tl.manage_mode as manageType,
|
tl.manage_mode as manageType,
|
||||||
IFNULL(tl.tool_code,'/') as devCode,
|
IFNULL(tl.tool_code,'/') as devCode,
|
||||||
IFNULL(tl.in_num, 0) as useNum,
|
IFNULL(tl.in_num, 0) as useNum,
|
||||||
|
cdc.update_time AS updateTime,
|
||||||
2 as devType,
|
2 as devType,
|
||||||
tl.type_id as typeId,
|
tl.type_id as typeId,
|
||||||
tl.id as id
|
tl.id as id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue