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

tangxiaobao

2021-09-04 52e0ad7f25ca50e375bce10e47c9e30f3d39bdb2

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