Merge branch 'master' into develop1.0

VVT789

2025-02-17 466c70dccc2b46ffa62fd14c8b2f88349c5ef9c6

 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;