From cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 20 十一月 2025 12:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/admin_timer/pom.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/server/visits/admin_timer/pom.xml b/server/visits/admin_timer/pom.xml
index 191358f..eb4aa16 100644
--- a/server/visits/admin_timer/pom.xml
+++ b/server/visits/admin_timer/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.doumee</groupId>
- <artifactId>dmvisit</artifactId>
+ <artifactId>visits</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
@@ -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