Merge branch 'rcs_master' into rcs_master_all_zkd

zhang

2 天以前 bd956ec24c5995e6a2a585d6a4987c6b7de372c1

 zy-acs-charge/src/main/java/com/zy/acs/charge/constant/AiPowerChargeRegisterEnum.java

File was renamed from zy-acs-charge/src/main/java/com/zy/acs/charge/constant/AiPowerChargerRegisterEnum.java
@@ -1,6 +1,6 @@
package com.zy.acs.charge.constant;

public enum AiPowerChargerRegisterEnum {
public enum AiPowerChargeRegisterEnum {
    // 寄存器地址 100~116
    CHARGE_VOLTAGE(100, 3, "充电机充电电压", 0.1),          // 单位0.1V
    CHARGE_CURRENT(101, 3, "充电机充电电流", 0.1),          // 单位0.1A
@@ -37,7 +37,7 @@
    private final String des;
    private final Double raw;    // 单位转换因子（原始值 × raw = 实际物理量）

    AiPowerChargerRegisterEnum(Integer addr, Integer type, String des, Double raw) {
    AiPowerChargeRegisterEnum(Integer addr, Integer type, String des, Double raw) {
        this.addr = addr;
        this.type = type;
        this.des = des;