Merge remote-tracking branch 'origin/master'

zhoushihao

2024-08-06 c5a2b71990cabc221834b856c99954677f1b5646

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/JsonFile/PlcCacheGlass.json

@@ -18,6 +18,13 @@
          "unit":""
       },
       {
          "codeId": "Current_slot",
          "addressIndex":"36",
          "addressLenght":"2",
          "ratio":"1",
          "unit":""
       },
        {
          "codeId": "MES_confirmation_word",
          "addressIndex":"38",
          "addressLenght":"2",
@@ -25,7 +32,7 @@
          "unit":""
       },
       {
          "codeId": "A09_glass_status",
          "codeId": "A08_glass_status",
          "addressIndex":"68",
          "addressLenght":"2",
          "ratio":"1",