Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3

Junjie

2024-06-12 8a8faba0f55512a2c18c4fe719a1bb0c4f6a86c9

 src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java

@@ -1,6 +1,5 @@
package com.zy.asrs.domain.vo;

import com.sun.xml.internal.fastinfoset.algorithm.IntEncodingAlgorithm;
import lombok.Data;

@Data
@@ -40,7 +39,7 @@
    /**
     * 当前的电压值
     */
    private Short currentVoltage;
    private Integer currentVoltage;

    /**
     * 当前的模拟量值