fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/resources/mapper/member/MemberWalletCoinDao.xml

@@ -29,7 +29,15 @@
   </update>

    

    



   <update id="updateBlockBalance">

      update member_wallet_coin

      set

      available_balance = IFNULL(available_balance, 0) + #{availableBalance},

      total_balance = IFNULL(total_balance, 0) + #{availableBalance},

      early_balance = IFNULL(early_balance, 0) + #{earlyBalance},

      block_number  = IFNULL(block_number, 0) + #{blockNumber}

      where id=#{id}

   </update>





</mapper>