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

tangxiaobao

2021-09-06 5fc3fd7cbad93a8bc4a0d13f8217d4e2642450df

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.java

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

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

}