Merge branch 'test_elder_cedoo' into test

CeDo

2021-06-11 3a4c910adc41f934400e2f4a583e7d89b61e89f7

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