Merge branch 'feature' into 'release'

调整base-objects版本为application

See merge request !423

pom.xml

@@ -29,7 +29,7 @@
         <fastjson.version>1.2.47</fastjson.version>
         <easyexcel.version>3.0.5</easyexcel.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>
         <dozer.version>5.5.1</dozer.version>
         <dubbo.version>2.7.4.1</dubbo.version>
@@ -204,7 +204,7 @@
         <!-- 基础包 -->
         <dependency>
             <groupId>com.zhiwei.base</groupId>
-            <artifactId>base-objects</artifactId>
+            <artifactId>base-objects-application</artifactId>
             <version>${base-objects.version}</version>
         </dependency>
         <!-- es -->