From 43e5052b91f0568ccbcf3fd6df70cf8209db184a Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Fri, 28 May 2021 17:36:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- screen-manage/src/main/resources/mapper/DeviceMapper.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml index ac23a91..c688634 100644 --- a/screen-manage/src/main/resources/mapper/DeviceMapper.xml +++ b/screen-manage/src/main/resources/mapper/DeviceMapper.xml @@ -82,6 +82,7 @@ d.detector, d.purchaser, d.create_time, + d.install_time, d.extend, o.id org_id, o.`name` org_name, -- Gitblit v1.8.0