处理合并代码问题

Null

2021-03-17 8b13ca9086a609ef3bae76dab15faba55123d2dd

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java

@@ -12,4 +12,5 @@
    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:";
}