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

huanghongfa

2021-07-23 1a69de7ac9d58ad8482b1540e13ee66b1adae291

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