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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventVisitingTasksDTO.java

@@ -115,7 +115,7 @@
    private Integer eventType;


    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;