Merge branch 'master' of gitee.com:hainatravel/information-system

webht/third_party/pay/controllers/AlipayTradeService.php

@@ -698,7 +698,7 @@ class AlipayTradeService extends CI_Controller
                 $c_M_RelatedInfo,
                 $c_M_State,
                 $c_M_AddTime,
-                'Alipay refund receipt');
+                'ChinaHighlights refund receipt');
             $this->Alipay_note_model->update_send($item->ALI_dealId, 'send-customer');
         }
         //添加邮件发送记录 end

webht/third_party/pay/controllers/iPayLinksService.php

@@ -758,7 +758,7 @@ class IPayLinksService extends CI_Controller
                 $c_M_RelatedInfo,
                 $c_M_State,
                 $c_M_AddTime,
-                'iPayLinks refund receipt');
+                'ChinaHighlights refund receipt');
             $this->Note_model->update_send($item->IPL_dealId, 'send-customer');
         }
         //添加邮件发送记录 end

webht/third_party/paypal/controllers/index.php

@@ -1027,7 +1027,7 @@ class Index extends CI_Controller {
                 $c_M_RelatedInfo,
                 $c_M_State,
                 $c_M_AddTime,
-                'paypal refund receipt');
+                'ChinaHighlights refund receipt');
             $this->Note_model->update_send($item->pn_txn_id, 'send-customer');
         }
         //添加邮件发送记录 end