Merge branch 'refs/heads/test_zjn' into test

yd-csf-service/src/main/resources/mappers/ExpectedFortuneMapper.xml

@@ -67,7 +67,7 @@
             MAX(ef.fortune_total_period) as fortuneTotalPeriod,
             ifnull(sum(ef.original_amount), 0) as amount,
             ifnull(sum(ef.hkd_amount), 0) as hkdAmount,
-            MAX(ef.currency) as currency,
+            MAX(ef.original_currency) as currency,
             ifnull(sum(ef.paid_amount), 0) as paidAmount,
             ifnull(sum(ef.unpaid_amount), 0) as unpaidAmount,
             case when ifnull(sum(ef.hkd_amount), 0) > 0
@@ -122,7 +122,7 @@
             ef.fortune_total_period as fortuneTotalPeriod,
             ifnull(ef.original_amount, 0) as amount,
             ifnull(ef.hkd_amount, 0) as hkdAmount,
-            ef.currency as currency,
+            ef.original_currency as currency,
             ifnull(ef.paid_amount, 0) as paidAmount,
             ifnull(ef.unpaid_amount, 0) as unpaidAmount,
             case when ifnull(ef.hkd_amount, 0) > 0