Merge remote-tracking branch 'origin/master'

jiangping

2024-09-02 843d0abd014ec20424844546fc57a9f976f366ba

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java

@@ -60,8 +60,8 @@
    @ExcelColumn(name="排序码")
    private Integer sortnum;

    @ApiModelProperty(value = "类型 0用电 1用电 2油耗", example = "1")
    @ExcelColumn(name="类型 0用电 1用电 2油耗")
    @ApiModelProperty(value = "类型 0用水 1用气 2用油", example = "1")
    @ExcelColumn(name="类型 0用水 1用气 2用油")
    private Integer type;

    @ApiModelProperty(value = "数量 (用电顿，用电度； 油耗L）", example = "1")