From d1b6a13a58afa4e03f4d6cb0a62cd759ccf306f4 Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期二, 04 三月 2025 10:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
pom.xml | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 00f24f9..7b9dfda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
<weixin-java-miniapp.version>4.5.0</weixin-java-miniapp.version>
<weixin-java-pay.version>4.6.0</weixin-java-pay.version>
+ <weixin-java-cp.version>4.6.0</weixin-java-cp.version>
</properties>
<profiles>
@@ -243,16 +244,16 @@
<version>${tencent.sms.version}</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>de.codecentric</groupId>-->
-<!-- <artifactId>spring-boot-admin-starter-server</artifactId>-->
-<!-- <version>${spring-boot-admin.version}</version>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>de.codecentric</groupId>-->
-<!-- <artifactId>spring-boot-admin-starter-client</artifactId>-->
-<!-- <version>${spring-boot-admin.version}</version>-->
-<!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>de.codecentric</groupId>-->
+ <!-- <artifactId>spring-boot-admin-starter-server</artifactId>-->
+ <!-- <version>${spring-boot-admin.version}</version>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>de.codecentric</groupId>-->
+ <!-- <artifactId>spring-boot-admin-starter-client</artifactId>-->
+ <!-- <version>${spring-boot-admin.version}</version>-->
+ <!-- </dependency>-->
<!--redisson-->
<dependency>
@@ -323,6 +324,12 @@
<dependency>
<groupId>org.ruoyi</groupId>
+ <artifactId>ruoyi-knowledge</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ruoyi</groupId>
<artifactId>ruoyi-demo</artifactId>
<version>${revision}</version>
</dependency>
--
Gitblit v1.9.3