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

wu

2024-06-18 671fb92246c499da1e655787bf8133b209ba7fad

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java

@@ -100,13 +100,12 @@
     * @param index 索引地址
     */
    public String getAddress(int index) {
        index=this.addressIndex;
        String[] stringdatas = this.startAddress.trim().split("\\.");
        int addressLength = this.addressLength;
        if (addressLength < 2) {
            return null;
        }
        int wordindex = index;
        int wordindex = Integer.parseInt(stringdatas[1]) + index;
        return stringdatas[0] + "." + wordindex;
      /*  if (addressLength == 2) {