liushoushan_notebook 51d1fb0589 Merge branch 'master' of https://gitee.com/ccliushou/iotgateway ... # Conflicts: # IoTGateway/IoTGateway.csproj # IoTGateway/IoTGateway.csproj.user # IoTGateway/Properties/PublishProfiles/FolderProfile.pubxml.user # IoTGateway/iotgateway.db # Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs # Plugins/Plugin/DeviceThread.cs		2022-07-23 08:25:21 +08:00
..
_Admin	升级至 .net6	2022-01-24 23:10:56 +08:00
BasicData	Merge branch 'master' of https://gitee.com/ccliushou/iotgateway	2022-07-23 08:25:21 +08:00
Config/SystemConfigVMs	增加属性上传、整合日志	2022-03-24 21:38:11 +08:00
HomeVMs	初步可用版本	2021-12-12 14:55:48 +08:00
MqttServer/MqttClientVMs	1.集成MqttServer,可查看当前客户端列表 2.增加表达式	2021-12-17 15:51:25 +08:00
Rpc/RpcLogVMs	优化rpc	2022-04-13 22:43:13 +08:00
IoTGateway.ViewModel.csproj	升级至 .net6	2022-01-24 23:10:56 +08:00