Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

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

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