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/CommonEventBatchRepublishDTO.java

@@ -22,8 +22,8 @@
public class CommonEventBatchRepublishDTO {

    @ApiModelProperty(value = "事件id", hidden = false, example = "1", required = true)
    @NotNull
    private List<Long> id;
    @NotNull(message = "事件ID不能为空")
    private List<String> id;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;