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

tangxiaobao

2021-09-06 21eee883b72fe0bfb41c325a92826a35c382d894

 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;


}