Merge remote-tracking branch 'origin/master'

jiangping

2025-03-07 9f4d96b920b842ecf7b4149b7c85b980dcbb3613

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

@@ -71,11 +71,11 @@

    @ApiModelProperty(value = "开始时间")
    @TableField(exist = false)
    private Date startTime;
    private String startTime;
    @ApiModelProperty(value = "年月时间")
    @TableField(exist = false)
    private String timeInfoStr;
    @ApiModelProperty(value = "开始时间")
    @TableField(exist = false)
    private Date endTime;
    private String endTime;
}