Merge branch 'dev_v1.3.5_20220929'

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

@@ -106,7 +106,7 @@
     </update>
     <sql id="selectReceiveRewardSql">
         <where>
-            ar.reward_type_ != 'ACTUAL'
+            ar.reward_type_ != 'ACTUAL' and grant_flag_=1
             <if test="query.userId != null">
                 and aur.user_id_ = #{query.userId}
             </if>