Merge branch 'hemenkou_dev' into dev

101captain

2022-03-10 20b528c879f3e96bf72516f58ac7341b204b12be

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

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

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

}