Merge branch 'xgg-saas-merchant' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-merchant

xgg-saas-merchant/app/base/controller/impl/saas/merchantCtl.js

@@ -19,8 +19,8 @@ class MerchantCtl extends CtlBase {
     try {
       params.forceUpdate = true;
       let feeType = await this.merchantSve.getFeeTypeWithCache(params);
-      let dic = [{"type": "00", "name": "注册订单付款"}, {"type": "10", "name": "转账交易付款10（仅供测试）"}, {"type": "20", "name": "转账交易付款20（仅供测试）"}];
-      // let dic = [{"type": "00", "name": "注册订单付款"}, {"type": feeType, "name": "转账交易付款"}];
+      // let dic = [{"type": "00", "name": "注册订单付款"}, {"type": "10", "name": "转账交易付款10（仅供测试）"}, {"type": "20", "name": "转账交易付款20（仅供测试）"}];
+      let dic = [{"type": "00", "name": "注册订单付款"}, {"type": feeType, "name": "转账交易付款"}];
       return system.getResultSuccess(dic);
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);