Merge branch 'develop1.0' into zhangjw_form_develop1.0

zhang

2025-04-18 79e5f89924577aee65b6127e0d7966ffb0e5fdc4

 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;