Merge branch 'dev_1_3_2_20220815'

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanEvaluationMapper.xml

@@ -25,7 +25,7 @@
                 a.activity_id_ as activityId,
                 a.evaluation_id_ as bizId,
                 b.user_id_ as userId,
-                c.id_ as rewardId
+                c.reward_id_ as rewardId
             from (
                 select
                     a.activity_id_,a.evaluation_id_,a.score_,min(b.id_) as id_