Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 2bff00bae9369d70d29acde8fea1fd8192ada033

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