解决冲突

doum

2026-03-06 34fe52caba63e6a6337cb9c3e6bd0d4707fd6a99

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/WaterByMonthResponse.java

@@ -21,9 +21,9 @@
    private BigDecimal currentMonth;

    @ApiModelProperty(value = "上个月用水量（吨）", example = "1")
    private String lastMonth;
    private BigDecimal lastMonth;

    @ApiModelProperty(value = "去年同月用水量（吨）", example = "1")
    private String lastYearMonth;
    private BigDecimal lastYearMonth;

}