Merge branch 'test_future_wangge' into test

CeDo

2021-06-08 b8c921ddc3ac548e97f7c60116768f04944e8a98

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

@@ -126,7 +126,7 @@
    private String propagandaObject;


    @Length(max=10)
    @Length(max=8)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
    private String propagandaNum;