add

app/service/credit/apply.js

@@ -363,7 +363,7 @@ class ApplyService extends Service {
         }
         let YysOrderInfo = await ctx.prometheusModel.CreditYysOrder.create(addYysOrder);
         ret.order_sn = orderSnInfo.data.orderSn;
-        
+
         return ret;
     }
 

config/config.local.js

@@ -17,13 +17,8 @@ module.exports = appInfo => {
     domainWhiteList: [],
   };
 
-<<<<<<< HEAD
   config.middleware = ['errorHandler', 'deviceLogin', 'deviceInit', 'responseSet'];
-  // config.middleware = [];
-=======
-  // config.middleware = [ 'errorHandler', 'deviceLogin', 'deviceInit', 'responseSet' ];
   config.middleware = [];
->>>>>>> 3e87c77c40fa53e79388f2de88910bcc217f5e6b
 
   exports.multipart = {
     // 不用steam用file