Merge remote-tracking branch 'remotes/origin/test'

manailin

2021-08-04 c2197723fdd911962372c58499171d8c909b8ebc

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

@@ -19,5 +19,5 @@
    private Long id;

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