merge origin test

25314761 · chengye · 2d46c355 · 62d6f8cb · 25314761 · 25314761
--- a/application/em/controller/Payment.php
+++ b/application/em/controller/Payment.php
@@ -438,6 +438,7 @@ class Payment extends Base
            }
            $details[$k]['projectNumber'] = $this->getDetailsFields($inv->account_id);
            $details[$k]['contractNumber'] = $this->getDetailsFields($inv->account_id,true);
            $details[$k]['receipt'] = '';
        }

--- a/application/em/view/region/region_list.html
+++ b/application/em/view/region/region_list.html
@@ -249,3 +249,4 @@
 {/block}