Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zf

2024-03-25 cd02923a7ce1ffa004b3abbb7af67ab6173dd99d

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/ConsumableEnum.java

@@ -4,8 +4,8 @@
import java.util.Map;

public enum ConsumableEnum {
    YES((byte) 0, "是"),
    NO((byte) 1, "否");
    YES((byte) 0, "耗材"),
    NO((byte) 1, "非耗材");

    private Byte code;
    private String value;