处理合并代码问题

Null

2021-03-17 8b13ca9086a609ef3bae76dab15faba55123d2dd

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

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

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


}