修复丢失文件

gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/constant/RedisKeyConstants.java

@@ -61,7 +61,6 @@ public final class RedisKeyConstants {
      * appType: miniapp(小程序), mp(公众号)
      */
     public static final String WECHAT_ACCESS_TOKEN = "wechat:access_token:";
-<<<<<<< HEAD
 
     // ==================== 认证模块 ====================
 
@@ -71,6 +70,4 @@ public final class RedisKeyConstants {
      * 用途：存储登录/注册等场景的短信验证码
      */
     public static final String SMS_CODE = "sms:code:";
-=======
->>>>>>> 08cf82a (签到模块)
 }