Merge remote-tracking branch 'origin/master'

zhoushihao

2024-05-09 16f724625149f6c1822785337ada5abe43bf1e2f

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

@@ -100,6 +100,7 @@
     * @param index 索引地址
     */
    public String getAddress(int index) {
        index=this.addressIndex;
        String[] stringdatas = this.startAddress.trim().split("\\.");
        int addressLength = this.addressLength;
        if (addressLength < 2) {
@@ -118,11 +119,6 @@
            return stringdatas[0] + "." + wordindex + "-" + newIndex;
        }*/
//        return null;
    }

    public int getPlcAddress() {

        return addressIndex;
    }

    public String getAddress() {