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

无关风月

9 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

 cloud-server-activity/src/main/java/com/dsh/activity/model/response/StoreVos.java

@@ -16,4 +16,6 @@

    String num3;
    String num4;
    // 场地名称
    String num5;
}