Merge branch 'refs/heads/feature_member_score' into dev

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreLog/MemberUserScoreLogServiceImpl.java

@@ -116,7 +116,8 @@ public class MemberUserScoreLogServiceImpl extends AbstractService<MemberUserSco
                 setScoreRuleLogDetail(userScoreLogDO, appMemberUserScoreLogRespVOS);
             }
         }
-
+        // 根据创建时间倒序
+        appMemberUserScoreLogRespVOS.sort(Comparator.comparing(AppMemberUserScoreLogRespVO::getCreateTime).reversed());
         return appMemberUserScoreLogRespVOS;
     }
 

yudao-module-member/yudao-module-member-impl/src/main/resources/mapper/user/MemberUserScoreMapper.xml

@@ -20,7 +20,7 @@
         from member_user mu
         left join member_user_score mus on mus.member_id = mu.id
         left join ecw_region re on re.id = mu.country
-        left join ecw_region rea on re.id = mu.city
+        left join ecw_region rea on rea.id = mu.city
         where 1 = 1
         <include refid="scoreCondition"/>
         order by mu.id