Merge branch 'master' into develop1.0

zt916916

2025-03-20 46ae931e952078fc534de0b73bdc1cd35e26a597

 zhitan-common/src/main/java/com/zhitan/common/enums/ElectricityTypeEnum.java

@@ -9,7 +9,9 @@
    SHARP("尖"),
    PEAK("峰"),
    FLAT("平"),
    VALLEY("谷");
    VALLEY("谷"),
    DEEP("深谷");


    private final String desc;