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

huanghongfa

2021-06-17 ce4b6a8e4c11a869f5707eef053488c62fb97eed

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