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

rk

2 天以前 69758b26403c3c97ad35c2c76125a1ff36a3e9d0

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

@@ -126,8 +126,14 @@
    @ExcelColumn(name="事件等级",valueMapping = "0=低;1=中;2=高;",width=10,index = 4)
    @TableField(exist = false)
    private Integer warningLevel;
    @ApiModelProperty(value = "事件编码")
    @TableField(exist = false)
    private String warningCode;


    @ApiModelProperty(value = "创建人名称")
    @TableField(exist = false)
    private String createUserName;

    @ApiModelProperty(value = "查询时间开始  ")
    @TableField(exist = false)