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

@@ -77,7 +77,7 @@
    @NotNull(message = "宣传对象不能为空")
    private String propagandaObject;

    @Length(max=10)
    @Length(max=8)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "", required = true)
    @NotNull(message = "宣传人数不能为空")
    private String propagandaNum;