代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

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

@@ -23,5 +23,4 @@
    @ApiModelProperty("是否默认 0 否 1 是")
    private Integer isDefault;


}