Commit 04fb34bf authored by hezhen's avatar hezhen

Merge branch 'master-tiande' into dev-tiande

parents dcc5ac95 3ca6a17b
...@@ -11,17 +11,18 @@ ...@@ -11,17 +11,18 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ace-auth-client</artifactId> <artifactId>ace-auth-client</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId> <artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-auth-common</artifactId> <artifactId>ace-auth-common</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>io.github.openfeign</groupId>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ace-auth-common</artifactId> <artifactId>ace-auth-common</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
......
...@@ -115,19 +115,19 @@ ...@@ -115,19 +115,19 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-interface</artifactId> <artifactId>ace-interface</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId> <artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-auth-common</artifactId> <artifactId>ace-auth-common</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ace-common</artifactId> <artifactId>ace-common</artifactId>
<version>2.0-td-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
......
...@@ -91,23 +91,23 @@ ...@@ -91,23 +91,23 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-interface</artifactId> <artifactId>ace-interface</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-auth-client</artifactId> <artifactId>ace-auth-client</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId> <artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform</artifactId> <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> <relativePath>../../xx-common/xx-common-platform/pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
</project> </project>
\ No newline at end of file
...@@ -3,12 +3,10 @@ package com.github.wxiaoqi.security.admin.entity; ...@@ -3,12 +3,10 @@ package com.github.wxiaoqi.security.admin.entity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
/** /**
...@@ -114,4 +112,13 @@ public class BaseUserMemberLevel implements Serializable { ...@@ -114,4 +112,13 @@ public class BaseUserMemberLevel implements Serializable {
@ApiModelProperty(value = "会员商品图片") @ApiModelProperty(value = "会员商品图片")
private String itemImg; private String itemImg;
@Transient
private BigDecimal showShareAmount;
public BigDecimal getShowShareAmount(){
return price.multiply(shareAmount).divide(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
}
} }
...@@ -34,32 +34,32 @@ ...@@ -34,32 +34,32 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId> <artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-universal-api</artifactId> <artifactId>xx-universal-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-im-api</artifactId> <artifactId>xx-im-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-app-api</artifactId> <artifactId>xx-app-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-activity-api</artifactId> <artifactId>xx-activity-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-tour-api</artifactId> <artifactId>xx-tour-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-interface</artifactId> <artifactId>ace-interface</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<!-- druid --> <!-- druid -->
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-auth-client</artifactId> <artifactId>ace-auth-client</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
...@@ -222,24 +222,24 @@ ...@@ -222,24 +222,24 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-universal-api</artifactId> <artifactId>xx-universal-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-order-api</artifactId> <artifactId>xx-order-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-app-api</artifactId> <artifactId>xx-app-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId> <artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ace-interface</artifactId> <artifactId>ace-interface</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
......
...@@ -105,13 +105,13 @@ ...@@ -105,13 +105,13 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-interface</artifactId> <artifactId>ace-interface</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId> <artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
...@@ -5,23 +5,24 @@ ...@@ -5,23 +5,24 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform</artifactId> <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> <relativePath>../../xx-common/xx-common-platform/pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-activity-api</artifactId> <artifactId>xx-activity-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-universal-api</artifactId> <artifactId>xx-universal-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-auth-client</artifactId> <artifactId>ace-auth-client</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform-web</artifactId> <artifactId>xx-common-platform-web</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-activity-api</artifactId> <artifactId>xx-activity-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-order-api</artifactId> <artifactId>xx-order-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,23 +5,24 @@ ...@@ -5,23 +5,24 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform</artifactId> <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> <relativePath>../../xx-common/xx-common-platform/pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-app-api</artifactId> <artifactId>xx-app-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-campsite-api</artifactId> <artifactId>xx-campsite-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-tour-api</artifactId> <artifactId>xx-tour-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform-web</artifactId> <artifactId>xx-common-platform-web</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-app-api</artifactId> <artifactId>xx-app-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,16 +5,17 @@ ...@@ -5,16 +5,17 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform</artifactId> <artifactId>xx-common-platform</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-campsite-api</artifactId> <artifactId>xx-campsite-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform-web</artifactId> <artifactId>xx-common-platform-web</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-campsite-api</artifactId> <artifactId>xx-campsite-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId> <artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- <dependency> <!-- <dependency>
......
...@@ -5,11 +5,12 @@ ...@@ -5,11 +5,12 @@
<parent> <parent>
<artifactId>xx-common-platform</artifactId> <artifactId>xx-common-platform</artifactId>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<relativePath>../xx-common-platform/pom.xml</relativePath> <relativePath>../xx-common-platform/pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>xx-common-platform-web</artifactId> <artifactId>xx-common-platform-web</artifactId>
<version>2.0-td-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
...@@ -120,7 +121,7 @@ ...@@ -120,7 +121,7 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-auth-client</artifactId> <artifactId>ace-auth-client</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<!-- 其他 --> <!-- 其他 -->
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>xx-common-platform</artifactId> <artifactId>xx-common-platform</artifactId>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId> <artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-interface</artifactId> <artifactId>ace-interface</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<!-- 持久层 --> <!-- 持久层 -->
<dependency> <dependency>
......
...@@ -5,28 +5,29 @@ ...@@ -5,28 +5,29 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform</artifactId> <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> <relativePath>../../xx-common/xx-common-platform/pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-im-api</artifactId> <artifactId>xx-im-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<!--引入开源后台项目的公共包--> <!--引入开源后台项目的公共包-->
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-auth-client</artifactId> <artifactId>ace-auth-client</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-universal-api</artifactId> <artifactId>xx-universal-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- 自己项目 --> <!-- 自己项目 -->
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-im-api</artifactId> <artifactId>xx-im-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,43 +5,42 @@ ...@@ -5,43 +5,42 @@
<parent> <parent>
<artifactId>xx-common-platform</artifactId> <artifactId>xx-common-platform</artifactId>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.0-SNAPSHOT</version>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-order-api</artifactId> <artifactId>xx-order-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-activity-api</artifactId> <artifactId>xx-activity-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-vehicle-api</artifactId> <artifactId>xx-vehicle-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-tour-api</artifactId> <artifactId>xx-tour-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-universal-api</artifactId> <artifactId>xx-universal-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>xx-common-platform-web</artifactId> <artifactId>xx-common-platform-web</artifactId>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>xx-order-server</artifactId> <artifactId>xx-order-server</artifactId>
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-order-api</artifactId> <artifactId>xx-order-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-app-api</artifactId> <artifactId>xx-app-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
......
...@@ -5,17 +5,18 @@ ...@@ -5,17 +5,18 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform</artifactId> <artifactId>xx-common-platform</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-summit-api</artifactId> <artifactId>xx-summit-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-universal-api</artifactId> <artifactId>xx-universal-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>xx-common-platform-web</artifactId> <artifactId>xx-common-platform-web</artifactId>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-summit-api</artifactId> <artifactId>xx-summit-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
......
...@@ -5,22 +5,24 @@ ...@@ -5,22 +5,24 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform</artifactId> <artifactId>xx-common-platform</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-tour-api</artifactId> <artifactId>xx-tour-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-vehicle-api</artifactId> <artifactId>xx-vehicle-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform-web</artifactId> <artifactId>xx-common-platform-web</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
...@@ -15,20 +15,20 @@ ...@@ -15,20 +15,20 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-tour-api</artifactId> <artifactId>xx-tour-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-app-api</artifactId> <artifactId>xx-app-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-universal-api</artifactId> <artifactId>xx-universal-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform</artifactId> <artifactId>xx-common-platform</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-uccn-api</artifactId> <artifactId>xx-uccn-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
</project> </project>
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform-web</artifactId> <artifactId>xx-common-platform-web</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-uccn-api</artifactId> <artifactId>xx-uccn-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -30,19 +30,19 @@ ...@@ -30,19 +30,19 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-vehicle-api</artifactId> <artifactId>xx-vehicle-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-tour-api</artifactId> <artifactId>xx-tour-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-campsite-api</artifactId> <artifactId>xx-campsite-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,11 +5,12 @@ ...@@ -5,11 +5,12 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform</artifactId> <artifactId>xx-common-platform</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-universal-api</artifactId> <artifactId>xx-universal-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<!-- xstream XML工具--> <!-- xstream XML工具-->
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>xx-common-platform-web</artifactId> <artifactId>xx-common-platform-web</artifactId>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-universal-api</artifactId> <artifactId>xx-universal-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-vehicle-api</artifactId> <artifactId>xx-vehicle-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-app-api</artifactId> <artifactId>xx-app-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- 诺诺发票sdk--> <!-- 诺诺发票sdk-->
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-order-api</artifactId> <artifactId>xx-order-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform</artifactId> <artifactId>xx-common-platform</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-user-behavior-api</artifactId> <artifactId>xx-user-behavior-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
</project> </project>
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform-web</artifactId> <artifactId>xx-common-platform-web</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
...@@ -15,19 +15,19 @@ ...@@ -15,19 +15,19 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-user-behavior-api</artifactId> <artifactId>xx-user-behavior-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-activity-api</artifactId> <artifactId>xx-activity-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,16 +5,17 @@ ...@@ -5,16 +5,17 @@
<parent> <parent>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<artifactId>xx-common-platform</artifactId> <artifactId>xx-common-platform</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-vehicle-api</artifactId> <artifactId>xx-vehicle-api</artifactId>
<version>2.0-td-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId> <artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>xx-common-platform-web</artifactId> <artifactId>xx-common-platform-web</artifactId>
<groupId>com.xxfc.common</groupId> <groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
...@@ -20,19 +20,19 @@ ...@@ -20,19 +20,19 @@
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-vehicle-api</artifactId> <artifactId>xx-vehicle-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-universal-api</artifactId> <artifactId>xx-universal-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.platform</groupId>
<artifactId>xx-order-api</artifactId> <artifactId>xx-order-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-td-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment