Merge branch 'rcs_master' into rcs_master_all_zkd

zhang

2 天以前 bd956ec24c5995e6a2a585d6a4987c6b7de372c1

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

File was renamed from zy-acs-charge/src/main/java/com/zy/acs/charge/constant/AiPowerChargerCoilEnum.java
@@ -3,7 +3,7 @@
/**
 *
 */
public enum AiPowerChargerCoilEnum {
public enum AiPowerChargeCoilEnum {


    WORK_STATUS(100, 1, "工作状态"),
@@ -34,7 +34,7 @@
    private String des;


    AiPowerChargerCoilEnum(int addr, int type, String des) {
    AiPowerChargeCoilEnum(int addr, int type, String des) {
        this.addr = addr;
        this.type = type;
        this.des = des;