Commit Graph

5 Commits

Author SHA1 Message Date
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
iioter
2a75a15ed4 1.升级依赖2.优化表达式3.解决已知bug 2022-07-15 22:34:52 +08:00
liushoushan_notebook
6030f63100 修复bug和计算表达式问题 2022-06-13 16:41:17 +08:00
dd
30f07f7172 升级至 .net6 2022-01-24 23:10:56 +08:00
dd
507b0c2114 添加前后端框架源码 2021-12-14 14:10:44 +08:00