Merge remote-tracking branch 'origin/master'

puzhibing

2023-02-24 b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1

 management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js

@@ -40,6 +40,10 @@
    parent.layer.close(window.parent.TDriver.layerIndex);
}

TDriverInfoDlg.closeException = function() {
    parent.layer.close(window.parent.TDriverException.layerIndex);
}

/**
 * 收集数据
 */
@@ -72,6 +76,8 @@
    .set('serverStatus')
    .set('integral')
    .set('status')
        .set('area')
        .set('areaId')
    .set('createTime');
}