From 67b7fca6f21c2088a1887ba2027360efdb089c1c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 16:08:12 +0800
Subject: [PATCH] 代码合并冲突解决
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java
index 5933c29..b9c1a70 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java
@@ -12,6 +12,8 @@
public static final String USER_ID = "user_id";
public static final String LOGOUT_TOKEN = "logout:";
public static final String LOGIN_USER_INFO = "login_user_info:";
- public static final String PHONE_PUT="phone_put:";
- public static final String NEWS_ID="news_media_id:";
+ public static final String PHONE_PUT = "phone_put:";
+ public static final String NEWS_ID = "news_media_id:";
+
+ public static final String NEWS_LIST = "news_list:";
}
\ No newline at end of file
--
Gitblit v1.7.1