Merge remote-tracking branch 'origin/develop1.0' into develop_alioo

ali

2025-01-20 34a007951daf79f8d549ceb811d7fa9ed3fab6fd

 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;