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

CeDo

2021-05-07 117d31db6105fc64d778f45af8b661608ba494dc

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