Authored by 张凯

Merge branch 'master-mj-joke' into 'master-mj'

chore:系统打包版本升级到6.3.1

chore:系统打包版本升级到6.3.1

See merge request !108
@@ -9,12 +9,12 @@ @@ -9,12 +9,12 @@
9 <relativePath/> 9 <relativePath/>
10 </parent> 10 </parent>
11 11
12 - <name>aj-report</name> 12 + <name>mj-aj-report</name>
13 <modelVersion>4.0.0</modelVersion> 13 <modelVersion>4.0.0</modelVersion>
14 14
15 <groupId>com.anji-plus</groupId> 15 <groupId>com.anji-plus</groupId>
16 <artifactId>aj-report</artifactId> 16 <artifactId>aj-report</artifactId>
17 - <version>2.0.2.RELEASE</version> 17 + <version>6.3.1</version>
18 18
19 <properties> 19 <properties>
20 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 20 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -174,7 +174,7 @@ @@ -174,7 +174,7 @@
174 </profiles> 174 </profiles>
175 175
176 <build> 176 <build>
177 - <finalName>mj-aj-report_6.3.0.${timestamp}</finalName> 177 + <finalName>${project.name}_${project.version}.${timestamp}</finalName>
178 <resources> 178 <resources>
179 <resource> 179 <resource>
180 <directory>src/main/resources</directory> 180 <directory>src/main/resources</directory>