Merge remote-tracking branch 'origin/master'

dongjian-center-admin-controller/src/main/resources/sql/initDatabase.sql

@@ -1239,7 +1239,8 @@ CREATE TABLE `device_info` (
   `dashboard_decimal_places` int DEFAULT '2' COMMENT 'dashboard显示小数位数',
   PRIMARY KEY (`id`),
   KEY `idx_device_info` (`device_id`,`flag`,`type_id`),
-  KEY `idx_device_info_query` (`device_id`,`flag`)
+  KEY `idx_device_info_query` (`device_id`,`flag`),
+  KEY `idx_asset_flag_type` (`asset_id`,`flag`,`type_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='需要解析的zeta设备';
 
 /*Table structure for table `device_rawdata_realtime` */