Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-31 dde29a93461a81940dbef9a65c60fa2690f2097e

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