Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-07-16 e845f2033e1be42896f891ee12b866d174214529

 gc-user/src/main/resources/mapper/user/UserHeadDetailsMapper.xml

@@ -17,5 +17,6 @@
         inner join xzx_user_info d on b.user_id = d.user_id
        where head_user_id=#{userId}
        group by a.order_no, d.nick_name, a.score, a.amount, b.receiving_time
        order by b.receiving_time desc
    </select>
</mapper>