Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-05-21 819c0b6478fb3385c8457cd03e04fdf0d3b90a70

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java

@@ -32,8 +32,7 @@
    @Excel(name = "描述、技术要求")
    private String description;

    /** 勘探点类型（1-探井、2-钻孔） */
    @Excel(name = "勘探点类型", readConverterExp = "1=-探井、2-钻孔")
    /** 勘探点类型 */
    private String type;

    /** 孔口高程 */