From a37271af0a5a2eb04ca23c80cca32567c968fa8e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 25 七月 2024 15:00:33 +0800
Subject: [PATCH] 解决git冲突
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/contant/Constant.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/contant/Constant.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/contant/Constant.java
index 68766cb..d2ecc04 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/contant/Constant.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/contant/Constant.java
@@ -7,5 +7,6 @@
public static final int AspectOrderDataSource = 1 ;
- public static final String UserTokenKeyInHeader = "token" ;
+ //public static final String UserTokenKeyInHeader = "token" ;
+ public static final String UserTokenKeyInHeader = "Token" ;
}
--
Gitblit v1.8.0