Merge branch 'hemenkou_dev' into dev

101captain

2022-03-03 ae812df91394e0f3ee628ff5dbd5c54f6d6a3743

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java

@@ -34,4 +34,7 @@
    @ApiModelProperty(value = "来攀/离攀结束时间")
    private String stopTime;

    @ApiModelProperty(value = "类型 1燃气 2防火")
    private Integer pdfType;

}