Merge remote-tracking branch 'origin/master'

101captain

2021-12-14 10887d2e345348d1870069ee37a42c85d941a102

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

@@ -14,10 +14,9 @@
@ApiModel(value = "广告位置")
public class ComOpsAdvPosVO {


    @ApiModelProperty("自增id")
    private Long id;

    @ApiModelProperty("广告位置中文描述")
    private String desc;
    private String advDesc;
}