Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
back_recharge
jiahuiwen 2021-12-03 10:03:01 +08:00
commit 8157f05b32
1 changed files with 1 additions and 1 deletions

View File

@ -1461,7 +1461,7 @@ public class ActivityLogic implements IEventHandler{
return true;
}
}
// LOGGER.error("未开启或者活动表已删除的活动id{}",activityType);
// LOGGER.info("checkActivityOpen uid={} 未开启或者活动表已删除的活动id{}",user.getId(), activityType);
return false;
}