Merge branch 'refs/heads/test_zjn' into test

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

@@ -65,7 +65,7 @@
             MAX(p.product_name) as productName,
             ef.fortune_period as fortunePeriod,
             MAX(ef.fortune_total_period) as fortuneTotalPeriod,
-            ifnull(sum(ef.amount), 0) as amount,
+            ifnull(sum(ef.original_amount), 0) as amount,
             ifnull(sum(ef.hkd_amount), 0) as hkdAmount,
             MAX(ef.currency) as currency,
             ifnull(sum(ef.paid_amount), 0) as paidAmount,
@@ -120,7 +120,7 @@
             p.product_name as productName,
             ef.fortune_period as fortunePeriod,
             ef.fortune_total_period as fortuneTotalPeriod,
-            ifnull(ef.amount, 0) as amount,
+            ifnull(ef.original_amount, 0) as amount,
             ifnull(ef.hkd_amount, 0) as hkdAmount,
             ef.currency as currency,
             ifnull(ef.paid_amount, 0) as paidAmount,