Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

7 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

 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;
}