Merge branch 'dev' into 'test'

mall-server-front/src/main/java/com/fzm/mall/server/front/mq/consumer/UserAssetTransferConsumer.java

@@ -272,7 +272,7 @@ public class UserAssetTransferConsumer {
         }
         UserAssetRecord userAssetRecord = new UserAssetRecord();
         userAssetRecord.init(user.getUid(), record.getCoin(), 21, reNumber, stauts,
-                userRecive.getAddress(), hash, "转赠方扣除用户资产");
+                userRecive.getAddress(), hash, record.getRemark());
         userAssetRecordMapper.insert(userAssetRecord);
 
         /**
@@ -280,7 +280,7 @@ public class UserAssetTransferConsumer {
          */
         UserAssetRecord userReAssetRecord = new UserAssetRecord();
         userReAssetRecord.init(userRecive.getUid(), record.getCoin(), 20, reNumber, stauts,
-                user.getAddress(), hash, "接收方增加用户资产");
+                user.getAddress(), hash, record.getRemark());
         userAssetRecordMapper.insert(userReAssetRecord);
     }