Merge remote-tracking branch 'refs/remotes/origin/develop1.0' into pxm_from...

潘晓明

2025-02-13 de50dae9558f8872b05b1a05b2d88461683189c4

 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;