Merge branch 'test_future_wangge' into 'test'

罗元桥

2021-06-04 c62d25bf9cf51d7421035abd6489945e77db1f04

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