Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-24 c1b6a6157b8cd13192f9a9f5a819150504d08701

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java

@@ -52,9 +52,10 @@
                e.printStackTrace();
            }

`byte[] getplcvlues = plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
            PlcMesObject.setPlcParameterList(getplcvlues);

            byte[] getplcvlues = plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
            if (getplcvlues != null) {
                PlcMesObject.setPlcParameterList(getplcvlues);
            }
        }
    }
}