Merge branch 'test' into test_future_wangge

CeDo

2021-05-24 2e2126c6d4a788d994a006152f165b7ac7165882

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