Commit c141eeb3 by 陈健智

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

parents 4ce06a01 b118e559
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<fastjson.version>1.2.47</fastjson.version> <fastjson.version>1.2.47</fastjson.version>
<easyexcel.version>3.0.5</easyexcel.version> <easyexcel.version>3.0.5</easyexcel.version>
<marker.client.version>1.1.9-SNAPSHOT</marker.client.version> <marker.client.version>1.1.9-SNAPSHOT</marker.client.version>
<base-objects.version>2.1.4-SNAPSHOT</base-objects.version> <base-objects.version>2.1.6.1-SNAPSHOT</base-objects.version>
<es.version>7.9.2</es.version> <es.version>7.9.2</es.version>
<dozer.version>5.5.1</dozer.version> <dozer.version>5.5.1</dozer.version>
<dubbo.version>2.7.4.1</dubbo.version> <dubbo.version>2.7.4.1</dubbo.version>
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
<!-- 基础包 --> <!-- 基础包 -->
<dependency> <dependency>
<groupId>com.zhiwei.base</groupId> <groupId>com.zhiwei.base</groupId>
<artifactId>base-objects</artifactId> <artifactId>base-objects-application</artifactId>
<version>${base-objects.version}</version> <version>${base-objects.version}</version>
</dependency> </dependency>
<!-- es --> <!-- es -->
......
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