Merge remote-tracking branch 'origin/dev' into dev

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

 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,