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

huanghongfa

2021-08-31 49de13627ada2e6c7864691bf4d9a75f7d3a67f3

 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;
}