From 7a7d20bf91cd8e7b2936577a23350dd79fbc24fb Mon Sep 17 00:00:00 2001
From: letsgocoding <sdxt_0802@163.com>
Date: 星期三, 12 三月 2025 18:12:17 +0800
Subject: [PATCH] !109 update Merge pull request !109 from letsgocoding/wt_from_develop1.0
---
zhitan-framework/pom.xml | 2 +-
zhitan-generator/pom.xml | 2 +-
zhitan-admin/pom.xml | 2 +-
zhitan-system/pom.xml | 2 +-
zhitan-quartz/pom.xml | 2 +-
zhitan-common/pom.xml | 2 +-
pom.xml | 4 ++--
zhitan-admin/src/main/resources/application.yml | 2 +-
zhitan-vue/package.json | 4 ++--
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0b4c195..44c53af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.zhitan</groupId>
<artifactId>BaseAdminAPI</artifactId>
- <version>3.8.7</version>
+ <version>2.5.2</version>
<name>BaseAdminAPI</name>
<description>绠＄悊绯荤粺</description>
@@ -14,7 +14,7 @@
<packaging>pom</packaging>
<properties>
- <zhitan.version>3.8.7</zhitan.version>
+ <zhitan.version>2.5.2</zhitan.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
diff --git a/zhitan-admin/pom.xml b/zhitan-admin/pom.xml
index 6c36626..3690e33 100644
--- a/zhitan-admin/pom.xml
+++ b/zhitan-admin/pom.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>BaseAdminAPI</artifactId>
+ <version>2.5.2</version>
<groupId>com.zhitan</groupId>
- <version>3.8.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/zhitan-admin/src/main/resources/application.yml b/zhitan-admin/src/main/resources/application.yml
index d1430dd..ef4fb4a 100644
--- a/zhitan-admin/src/main/resources/application.yml
+++ b/zhitan-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@
# 鍚嶇О
name: admin
# 鐗堟湰
- version: 3.8.7
+ version: 2.5.2
# 鐗堟潈骞翠唤
copyrightYear: 2024
profile: ./uploadPath
diff --git a/zhitan-common/pom.xml b/zhitan-common/pom.xml
index d7a6fb9..53e470c 100644
--- a/zhitan-common/pom.xml
+++ b/zhitan-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>BaseAdminAPI</artifactId>
<groupId>com.zhitan</groupId>
- <version>3.8.7</version>
+ <version>2.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/zhitan-framework/pom.xml b/zhitan-framework/pom.xml
index 9bc2177..eb0d179 100644
--- a/zhitan-framework/pom.xml
+++ b/zhitan-framework/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>BaseAdminAPI</artifactId>
<groupId>com.zhitan</groupId>
- <version>3.8.7</version>
+ <version>2.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/zhitan-generator/pom.xml b/zhitan-generator/pom.xml
index 80461ac..5eb6d07 100644
--- a/zhitan-generator/pom.xml
+++ b/zhitan-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>BaseAdminAPI</artifactId>
<groupId>com.zhitan</groupId>
- <version>3.8.7</version>
+ <version>2.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/zhitan-quartz/pom.xml b/zhitan-quartz/pom.xml
index de7a4db..703bea4 100644
--- a/zhitan-quartz/pom.xml
+++ b/zhitan-quartz/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>BaseAdminAPI</artifactId>
<groupId>com.zhitan</groupId>
- <version>3.8.7</version>
+ <version>2.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/zhitan-system/pom.xml b/zhitan-system/pom.xml
index 8e81924..38c377d 100644
--- a/zhitan-system/pom.xml
+++ b/zhitan-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>BaseAdminAPI</artifactId>
<groupId>com.zhitan</groupId>
- <version>3.8.7</version>
+ <version>2.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/zhitan-vue/package.json b/zhitan-vue/package.json
index 1f3c3cb..9e74785 100644
--- a/zhitan-vue/package.json
+++ b/zhitan-vue/package.json
@@ -1,9 +1,9 @@
{
"name": "zhitan",
- "version": "3.8.7",
+ "version": "2.5.2",
"description": "绠＄悊绯荤粺",
"author": "admin",
- "license": "MIT",
+ "license": "Apache-2.0",
"type": "module",
"scripts": {
"dev": "vite",
--
Gitblit v1.9.3