From 09f0061cb76cbfc7a4798226c86f43b3d8744f3d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 10 十一月 2025 13:50:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/admin_timer/pom.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/server/visits/admin_timer/pom.xml b/server/visits/admin_timer/pom.xml
index 63b40a5..eb4aa16 100644
--- a/server/visits/admin_timer/pom.xml
+++ b/server/visits/admin_timer/pom.xml
@@ -22,6 +22,18 @@
<groupId>com.doumee</groupId>
<artifactId>dmvisit_service</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>4.31.1</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
--
Gitblit v1.9.3