Merge branch 'refs/heads/develop1.0' into dyl_dev

DYL

2025-02-11 2bb1c5a1f285e5380a675de6d88ab4b83d7fcef7

 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;