Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

2020-01-10 20:54:56 +08:00
parent 51419c269f 058eb515f0
commit 6a9b073187
51 changed files with 756 additions and 230 deletions
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java
@@ -36,7 +36,7 @@ public class ServiceConst {
    /**
     * 卡片 探路数据
     */
-    public static final String CARD_TYPE_ROAD_CODITION = "CARD_TYPE_ROAD_CODITION";
+    public static final String CARD_TYPE_ROAD_CONDITION = "CARD_TYPE_ROAD_CONDITION";

    /**
     * 卡片 分享音乐