Merge branch 'test' into 'test_screen'

罗元桥

2021-06-18 99ca25c5d2ee1e4d050f3aee96757bdfea195fc6

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