Merge branch 'dev_1_2_20220802'

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

@@ -45,7 +45,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean submit(ActivityReward activityReward) {
-        if(null == activityReward.getActivityId()){
+        if(null == activityReward.getId()){
             return createActivityReward(activityReward);
         }else{
             return updateActivityReward(activityReward);