Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

# Conflicts:
#	liquidnet-bus-config/liquidnet-config/application-dev.yml
#	liquidnet-bus-config/liquidnet-config/application-test.yml

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -186,7 +186,7 @@ liquidnet:
       url: "https://butler-dev.sit.sf-express.com"
       sk: 21e9a70f677a2bf29dfa2b3bead4f018
       appid: 557104628450889728
-      custid: '7551234567'
+      custid: "7551234567"
       jCompany: 北京正在映画互联网有限公司
       jContact: 摩登天空票务部
       jTel: 4006310750

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -189,7 +189,7 @@ liquidnet:
 #      url: "https://butler-dev.sit.sf-express.com"
 #      sk: 21e9a70f677a2bf29dfa2b3bead4f018
 #      appid: 557104628450889728
-#      custid: 7551234567
+#      custid: "7551234567"
 #      jCompany: 北京正在映画互联网有限公司
 #      jContact: 摩登天空票务部
 #      jTel: 4006310750
@@ -203,7 +203,7 @@ liquidnet:
       url: https://butler-ms.sf-express.com
       sk: ab85956fcb97382e05396b67f3666098
       appid: 572271814718803968
-      custid: '0102790784'
+      custid: "0102790784"
       jCompany: 北京正在映画互联网有限公司
       jContact: 摩登天空票务部
       jTel: 4006310750