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

doum

2 天以前 01a9bdffee1f04561b3b59406cbb7a76474c55f3

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

@@ -90,7 +90,7 @@
    //@ExcelColumn(name="推送时间")
    private Date pushDate;

    @ApiModelProperty(value = "推送方式 0钉钉通知", example = "1")
    @ApiModelProperty(value = "推送方式 0钉钉通知 1设备推送", example = "1")
    //@ExcelColumn(name="推送方式 0钉钉通知")
    private Integer pushType;