Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-20 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvPosDO.java

@@ -22,5 +22,5 @@
    /**
     * 广告位置中文描述
     */
    private String desc;
    private String advDesc;
}