From d8bfa0bc04c65929f9f370f2ad1d0b8ff445805d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 七月 2023 08:59:44 +0800
Subject: [PATCH] 合并代码处理冲突

---
 cloud-server-activity/src/main/java/com/dsh/activity/util/HeaderAuthUtil.java |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/course/util/HeaderAuthUtil.java b/cloud-server-activity/src/main/java/com/dsh/activity/util/HeaderAuthUtil.java
similarity index 100%
rename from cloud-server-activity/src/main/java/com/dsh/course/util/HeaderAuthUtil.java
rename to cloud-server-activity/src/main/java/com/dsh/activity/util/HeaderAuthUtil.java

--
Gitblit v1.7.1