Merge remote-tracking branch 'origin/pre_change_galaxy' into pre_change_galaxy

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftOrderMapper.xml

@@ -9,7 +9,7 @@
         c.trading_at, c.nft_id
         from goblin_nft_order as a
         left join goblin_goods_sku as b on b.sku_id = a.sku_id
-        left join goblin_user_digital_artwork as c on c.order_id = a.order_id
+        left join goblin_user_digital_artwork as c on c.order_id = a.order_id and c.del_flg = '0'
         <where>
             <if test="name!=''">
                 and b.name like concat('%', #{name}, '%')

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftOrderRefundMapper.xml

@@ -11,7 +11,7 @@
         from goblin_nft_order_refund as d
         left join goblin_nft_order as a on a.order_id = d.order_id
         left join goblin_goods_sku as b on b.sku_id = a.sku_id
-        left join goblin_user_digital_artwork as c on c.order_id = a.order_id
+        left join goblin_user_digital_artwork as c on c.order_id = a.order_id and c.del_flg = '0'
         <where>
             <if test="name!=''">
                 and b.name like concat('%', #{name}, '%')