Merge branch 'master-tiande' into dev-tiande

04fb34bf · hezhen · dcc5ac95 · 3ca6a17b · 04fb34bf · 04fb34bf
Commit 04fb34bf authored Nov 12, 2020 by hezhen
35 changed files
--- a/ace-auth/ace-auth-client/pom.xml
+++ b/ace-auth/ace-auth-client/pom.xml
@@ -11,17 +11,18 @@
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ace-auth-client</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
    <dependencies>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-auth-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>io.github.openfeign</groupId>

--- a/ace-auth/ace-auth-common/pom.xml
+++ b/ace-auth/ace-auth-common/pom.xml
@@ -11,6 +11,7 @@
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ace-auth-common</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
    <dependencies>
        <dependency>
            <groupId>io.jsonwebtoken</groupId>

--- a/ace-auth/ace-auth-server/pom.xml
+++ b/ace-auth/ace-auth-server/pom.xml
@@ -115,19 +115,19 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-interface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-auth-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>

        <dependency>

--- a/ace-common/pom.xml
+++ b/ace-common/pom.xml
@@ -11,6 +11,7 @@
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ace-common</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>

--- a/ace-gate/pom.xml
+++ b/ace-gate/pom.xml
@@ -91,23 +91,23 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-interface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-auth-client</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>

--- a/ace-modules/ace-admin-api/pom.xml
+++ b/ace-modules/ace-admin-api/pom.xml
@@ -5,10 +5,11 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
        <relativePath>../../xx-common/xx-common-platform/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.github.wxiaoqi</groupId>
    <artifactId>ace-admin-api</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
 </project>
\ No newline at end of file
--- a/ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java
+++ b/ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java
@@ -3,12 +3,10 @@ package com.github.wxiaoqi.security.admin.entity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.math.RoundingMode;


 /**
@@ -114,4 +112,13 @@ public class BaseUserMemberLevel implements Serializable {
 	@ApiModelProperty(value = "会员商品图片")
 	private String itemImg;

+
+	@Transient
+	private BigDecimal showShareAmount;
+
+
+	public  BigDecimal getShowShareAmount(){
+		return  price.multiply(shareAmount).divide(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
+	}
+
 }
--- a/ace-modules/ace-admin/pom.xml
+++ b/ace-modules/ace-admin/pom.xml
@@ -34,32 +34,32 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-universal-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-im-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-app-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-activity-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-tour-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -125,7 +125,7 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-interface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>

        <!-- druid -->
@@ -190,7 +190,7 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-auth-client</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
@@ -222,24 +222,24 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-universal-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-order-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-app-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

--- a/ace-modules/ace-generator/pom.xml
+++ b/ace-modules/ace-generator/pom.xml
@@ -89,7 +89,7 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>

--- a/ace-modules/ace-interface/pom.xml
+++ b/ace-modules/ace-interface/pom.xml
@@ -11,6 +11,7 @@
    <modelVersion>4.0.0</modelVersion>

    <artifactId>ace-interface</artifactId>
+    <version>2.0-td-SNAPSHOT</version>

    <dependencies>
        <dependency>

--- a/ace-modules/ace-tool/pom.xml
+++ b/ace-modules/ace-tool/pom.xml
@@ -105,13 +105,13 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-interface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
    </dependencies>
 </project>
\ No newline at end of file
--- a/xx-activity/xx-activity-api/pom.xml
+++ b/xx-activity/xx-activity-api/pom.xml
@@ -5,23 +5,24 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
        <relativePath>../../xx-common/xx-common-platform/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
    <artifactId>xx-activity-api</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
    <dependencies>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-universal-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>

@@ -29,7 +30,7 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-auth-client</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

--- a/xx-activity/xx-activity-server/pom.xml
+++ b/xx-activity/xx-activity-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform-web</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
@@ -15,12 +15,12 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-activity-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-order-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

--- a/xx-app/xx-app-api/pom.xml
+++ b/xx-app/xx-app-api/pom.xml
@@ -5,23 +5,24 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
        <relativePath>../../xx-common/xx-common-platform/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
    <artifactId>xx-app-api</artifactId>
+    <version>2.0-td-SNAPSHOT</version>

    <dependencies>
    <dependency>
        <groupId>com.xxfc.platform</groupId>
        <artifactId>xx-campsite-api</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </dependency>
    <dependency>
        <groupId>com.xxfc.platform</groupId>
        <artifactId>xx-tour-api</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </dependency>
   </dependencies>


--- a/xx-app/xx-app-server/pom.xml
+++ b/xx-app/xx-app-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform-web</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
@@ -15,13 +15,13 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-app-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

--- a/xx-campsite/xx-campsite-api/pom.xml
+++ b/xx-campsite/xx-campsite-api/pom.xml
@@ -5,16 +5,17 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
    <artifactId>xx-campsite-api</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
    <dependencies>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
    </dependencies>
 </project>
\ No newline at end of file
--- a/xx-campsite/xx-campsite-server/pom.xml
+++ b/xx-campsite/xx-campsite-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform-web</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
@@ -16,12 +16,12 @@
         <dependency>
             <groupId>com.xxfc.platform</groupId>
             <artifactId>xx-campsite-api</artifactId>
-             <version>2.0-SNAPSHOT</version>
+             <version>2.0-td-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.github.wxiaoqi</groupId>
             <artifactId>ace-common</artifactId>
-             <version>2.0-SNAPSHOT</version>
+             <version>2.0-td-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!--  <dependency>

--- a/xx-common/xx-common-platform-web/pom.xml
+++ b/xx-common/xx-common-platform-web/pom.xml
@@ -5,11 +5,12 @@
    <parent>
        <artifactId>xx-common-platform</artifactId>
        <groupId>com.xxfc.common</groupId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
        <relativePath>../xx-common-platform/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>xx-common-platform-web</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
    <packaging>pom</packaging>

    <properties>
@@ -120,7 +121,7 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-auth-client</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>

        <!-- 其他 -->

--- a/xx-common/xx-common-platform/pom.xml
+++ b/xx-common/xx-common-platform/pom.xml
@@ -11,7 +11,7 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>xx-common-platform</artifactId>
    <groupId>com.xxfc.common</groupId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0-td-SNAPSHOT</version>
    <packaging>pom</packaging>

    <properties>
@@ -25,7 +25,7 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <exclusions>
                <exclusion>
                    <artifactId>commons-io</artifactId>
@@ -42,7 +42,7 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-interface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <!-- 持久层 -->
        <dependency>

--- a/xx-im/xx-im-api/pom.xml
+++ b/xx-im/xx-im-api/pom.xml
@@ -5,28 +5,29 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
        <relativePath>../../xx-common/xx-common-platform/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
    <artifactId>xx-im-api</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
        <dependencies>
            <dependency>
                <groupId>com.github.wxiaoqi</groupId>
                <artifactId>ace-admin-api</artifactId>
-                <version>2.0-SNAPSHOT</version>
+                <version>2.0-td-SNAPSHOT</version>
            </dependency>
            <!--引入开源后台项目的公共包-->
            <dependency>
                <groupId>com.github.wxiaoqi</groupId>
                <artifactId>ace-auth-client</artifactId>
-                <version>2.0-SNAPSHOT</version>
+                <version>2.0-td-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>com.xxfc.platform</groupId>
                <artifactId>xx-universal-api</artifactId>
-                <version>2.0-SNAPSHOT</version>
+                <version>2.0-td-SNAPSHOT</version>
                <scope>compile</scope>
            </dependency>
            <!-- 自己项目 -->

--- a/xx-im/xx-im-server/pom.xml
+++ b/xx-im/xx-im-server/pom.xml
@@ -36,7 +36,7 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-im-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>

    </dependencies>

--- a/xx-order/xx-order-api/pom.xml
+++ b/xx-order/xx-order-api/pom.xml
@@ -5,43 +5,42 @@
    <parent>
        <artifactId>xx-common-platform</artifactId>
        <groupId>com.xxfc.common</groupId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
-    <version>2.0-SNAPSHOT</version>
    <groupId>com.xxfc.platform</groupId>
    <artifactId>xx-order-api</artifactId>
-
+    <version>2.0-td-SNAPSHOT</version>
    <dependencies>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-activity-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-vehicle-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-tour-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-universal-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>

        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>

        <dependency>

--- a/xx-order/xx-order-server/pom.xml
+++ b/xx-order/xx-order-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>xx-common-platform-web</artifactId>
        <groupId>com.xxfc.common</groupId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>xx-order-server</artifactId>
@@ -22,14 +22,14 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-order-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>

        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-app-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>


--- a/xx-summit/xx-summit-api/pom.xml
+++ b/xx-summit/xx-summit-api/pom.xml
@@ -5,17 +5,18 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
    <artifactId>xx-summit-api</artifactId>
+    <version>2.0-td-SNAPSHOT</version>

    <dependencies>
    <dependency>
        <groupId>com.xxfc.platform</groupId>
        <artifactId>xx-universal-api</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </dependency>
    </dependencies>


--- a/xx-summit/xx-summit-server/pom.xml
+++ b/xx-summit/xx-summit-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>xx-common-platform-web</artifactId>
        <groupId>com.xxfc.common</groupId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
@@ -15,7 +15,7 @@
    <dependency>
        <groupId>com.xxfc.platform</groupId>
        <artifactId>xx-summit-api</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
        <scope>compile</scope>
    </dependency>


--- a/xx-tour/xx-tour-api/pom.xml
+++ b/xx-tour/xx-tour-api/pom.xml
@@ -5,22 +5,24 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
    <artifactId>xx-tour-api</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
+
    <dependencies>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-vehicle-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

--- a/xx-tour/xx-tour-server/pom.xml
+++ b/xx-tour/xx-tour-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform-web</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
@@ -15,20 +15,20 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-tour-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>

        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-app-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-universal-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
    </dependencies>


--- a/xx-uccn/xx-uccn-api/pom.xml
+++ b/xx-uccn/xx-uccn-api/pom.xml
@@ -5,9 +5,10 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
    <artifactId>xx-uccn-api</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
 </project>
\ No newline at end of file
--- a/xx-uccn/xx-uccn-server/pom.xml
+++ b/xx-uccn/xx-uccn-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform-web</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
@@ -15,13 +15,13 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-uccn-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -30,19 +30,19 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-vehicle-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-tour-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-campsite-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

--- a/xx-universal/xx-universal-api/pom.xml
+++ b/xx-universal/xx-universal-api/pom.xml
@@ -5,11 +5,12 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
    <artifactId>xx-universal-api</artifactId>
+    <version>2.0-td-SNAPSHOT</version>

    <dependencies>
        <!-- xstream XML工具-->

--- a/xx-universal/xx-universal-server/pom.xml
+++ b/xx-universal/xx-universal-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>xx-common-platform-web</artifactId>
        <groupId>com.xxfc.common</groupId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
@@ -15,13 +15,13 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-universal-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-vehicle-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>

@@ -81,7 +81,7 @@
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@@ -102,7 +102,7 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-app-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <!--        诺诺发票sdk-->
@@ -114,7 +114,7 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-order-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

--- a/xx-user-behavior-collect/xx-user-behavior-api/pom.xml
+++ b/xx-user-behavior-collect/xx-user-behavior-api/pom.xml
@@ -5,9 +5,10 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
    <artifactId>xx-user-behavior-api</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
 </project>
\ No newline at end of file
--- a/xx-user-behavior-collect/xx-user-behavior-server/pom.xml
+++ b/xx-user-behavior-collect/xx-user-behavior-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform-web</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
@@ -15,19 +15,19 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-user-behavior-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
        <groupId>com.xxfc.platform</groupId>
        <artifactId>xx-activity-api</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
        <scope>compile</scope>
    </dependency>
    </dependencies>

--- a/xx-vehicle/xx-vehicle-api/pom.xml
+++ b/xx-vehicle/xx-vehicle-api/pom.xml
@@ -5,16 +5,17 @@
    <parent>
        <groupId>com.xxfc.common</groupId>
        <artifactId>xx-common-platform</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
    <artifactId>xx-vehicle-api</artifactId>
+    <version>2.0-td-SNAPSHOT</version>
    <dependencies>
        <dependency>
            <groupId>com.github.wxiaoqi</groupId>
            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

--- a/xx-vehicle/xx-vehicle-server/pom.xml
+++ b/xx-vehicle/xx-vehicle-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>xx-common-platform-web</artifactId>
        <groupId>com.xxfc.common</groupId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-td-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xxfc.platform</groupId>
@@ -20,19 +20,19 @@
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-vehicle-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>

        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-universal-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.xxfc.platform</groupId>
            <artifactId>xx-order-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0-td-SNAPSHOT</version>
        </dependency>
    </dependencies>