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

xyh

2021-06-16 dedb6f26be813caaa0d6ec828d39deaa18fddcb3

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

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


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