Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2023-12-14 2a6d8a858ca7e41436548b35db147b5cdad4e4be

 CanadaMes-ui/src/configuration/Alarm.json

@@ -496,19 +496,12 @@
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B02.SR right in pos error",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    }
  ],
  "address": [
    {
      "name": "DB104.DBx0.0",
      "count": 72
      "name": "DB104.0.0",
      "count": 71
    }
  ]
}