Merge branch 'dev_1_3_2_20220815'

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

@@ -45,7 +45,7 @@ public class ActivityPlanEvaluationServiceImpl extends ServiceImpl<ActivityPlanE
             planExpand.setId(activityPlan.getId());
             planExpand.setCreateBy(activityPlan.getUserId());
             planExpand.setUpdateBy(activityPlan.getUserId());
-            save(planExpand);
+            saveOrUpdate(planExpand);
         } else {
             planExpand.setUpdateBy(activityPlan.getUserId());
             updateById(planExpand);

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

@@ -57,7 +57,7 @@ public class ActivityPlanStandardServiceImpl extends ServiceImpl<ActivityPlanSta
             planExpand.setId(activityPlan.getId());
             planExpand.setCreateBy(activityPlan.getUserId());
             planExpand.setUpdateBy(activityPlan.getUserId());
-            save(planExpand);
+            saveOrUpdate(planExpand);
         } else {
             planExpand.setUpdateBy(activityPlan.getUserId());
             updateById(planExpand);