解决代码合并功能被删除

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityRewardServiceImpl.java

@@ -208,6 +208,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
         activityReward.setStatus(status);
         activityReward.setUpdateBy(userId);
         updateById(activityReward);
+        
         return true;
     }