Merge remote-tracking branch 'remotes/origin/dev-6.0' into feature-feng-sampleBDetect-20200925

e53208bf · 潘栩锋 · 0dee0611 · c6c1a6e8 · e53208bf · e53208bf
Commit e53208bf authored Oct 09, 2020 by 潘栩锋 🚴
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

164.xlsx Resource/称重/设备连接变量表_164_v3/164.xlsx +0 -0

plcgroup.json Resource/称重/设备连接变量表_164_v3/Generated/plcgroup.json +1 -1

No files found.
--- a/Resource/称重/设备连接变量表_164_v3/164.xlsx
+++ b/Resource/称重/设备连接变量表_164_v3/164.xlsx
--- a/Resource/称重/设备连接变量表_164_v3/Generated/plcgroup.json
+++ b/Resource/称重/设备连接变量表_164_v3/Generated/plcgroup.json
@@ -608,7 +608,7 @@
    {
      "DeviceIndex": 1,
      "Mode": "4",
-      "Addr": 18590,
+      "Addr": 18596,
      "Type": "float",
      "Scale": 1.0,
      "OwnerName": "Items[1]",