Merge branch 'dev' into 'test'

mall-server-front/src/main/java/com/fzm/mall/server/front/asset/service/impl/UserAssetRecordServiceImpl.java

@@ -55,6 +55,7 @@ public class UserAssetRecordServiceImpl extends ServiceImpl<UserAssetRecordMappe
         QueryWrapper<UserAssetRecord> qw = new QueryWrapper<>();
         qw.eq("uid", uid);
         qw.eq("coin", coin);
+        qw.orderByDesc("update_time");
         String payment = assetRecordVo.getPayment();
         if (StringUtil.isNullOrEmpty(skuId)) {
             //查的积分

mall-server-front/src/main/resources/mapper/asset/UserAssetTransferRecordMapper.xml

@@ -22,5 +22,6 @@
         select *
         from user_asset_transfer_record
         where uid = #{uid} and goods_id = #{goodsId} and sku_id = #{skuId} and status = #{status}
+        order by update_time desc
     </select>
 </mapper>