From 506f60bb0fd433d2d79111a7f4dac57d871b3aed Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期五, 23 七月 2021 17:09:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0

---
 pom.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6223945..93b4257 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
 	</parent>
 
 	<groupId>com.genersoft</groupId>
-	<artifactId>wvp-gb28181</artifactId>
-	<version>2.0.0</version>
+	<artifactId>wvp-pro</artifactId>
+	<version>2.0</version>
 	<name>web video platform</name>
 
 	<repositories>
@@ -44,7 +44,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
+		<maven.build.timestamp.format>MMddHHmm</maven.build.timestamp.format>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 
 		<!-- 渚濊禆鐗堟湰 -->

--
Gitblit v1.8.0