XieYongHong 6a2250cbf3 Merge branch 'dev' into dev-dictionary ... # Conflicts: # src/views/device/Instance/Detail/ChildDevice/index.vue		2023-10-24 15:53:05 +08:00
..
ChildDevice	* fix: 子设备绑定与解绑	2023-10-23 18:11:14 +08:00
Diagnose	fix: bug#19087	2023-10-23 13:49:16 +08:00
EdgeMap	fix: 边缘端映射bug	2023-09-20 10:04:14 +08:00
Function	fix: 修复设备功能-执行包含object类型时异常	2023-10-23 11:51:17 +08:00
GateWay	feat: 修改设备接入网关Modbus、opcua为数采设备接入	2023-07-25 14:18:38 +08:00
Info	fix: 删除多余无效引入	2023-10-16 09:42:42 +08:00
Log	fix: 修复社区版bug	2023-04-18 09:24:16 +08:00
MetadataMap	fix: 优化物模型映射保存请求异常	2023-07-24 13:44:40 +08:00
Modbus	feat: 设备详情modbus和opcua	2023-02-22 18:09:48 +08:00
OPCUA	feat: 设备详情modbus和opcua	2023-02-22 18:09:48 +08:00
Parsing	fix: 修改设备透传默认脚本	2023-07-27 09:18:10 +08:00
Running	fix: bug#18784	2023-10-12 18:00:27 +08:00
components	fix: bug#19135、19137	2023-10-20 16:55:31 +08:00
index.vue	feat: 修改设备接入网关Modbus、opcua为数采设备接入	2023-07-25 14:18:38 +08:00