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

tangxiaobao

2021-07-31 dde29a93461a81940dbef9a65c60fa2690f2097e

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.java

@@ -20,5 +20,8 @@
    @ApiModelProperty("跳转内容")
    private String jumpContent;

    @ApiModelProperty("是否默认  0 否 1 是")
    private Integer isDefault;


}