Merge branch 'master' into develop1.0

z1415143022

2025-03-25 7b0346ed6bac6b451b3f6f5f1504a51bc88063ec

 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;