gsb

bpo-channel/app/base/db/models/channel/channelmerchant.js

@@ -11,7 +11,7 @@ module.exports = (db, DataTypes) => {
     contact_mobile: DataTypes.STRING,
     contact_mobile: DataTypes.STRING,
     contact_email: DataTypes.STRING,
     contact_email: DataTypes.STRING,
     contact_addr: DataTypes.STRING,
     contact_addr: DataTypes.STRING,
-
+    origin_merchant_name: DataTypes.STRING,
   }, {
   }, {
     paranoid: true, //假的删除
     paranoid: true, //假的删除
     underscored: true,
     underscored: true,
@@ -53,4 +53,4 @@ module.exports = (db, DataTypes) => {
       //  }
       //  }
     ]
     ]
   });
   });
-}
+}
\ No newline at end of file

bpo-channel/app/base/service/impl/channel/channelmerchantSve.js

@@ -31,6 +31,7 @@ class ChannelmerchantService extends ServiceBase {
       return system.getResult(null, "商户来源不存在");
       return system.getResult(null, "商户来源不存在");
     }
     }
 
 
+    mcht.origin_merchant_name = this.trim(params.origin_merchant_name);
     mcht.merchant_name = this.trim(params.merchant_name);
     mcht.merchant_name = this.trim(params.merchant_name);
     mcht.contact_man = this.trim(params.contact_man);
     mcht.contact_man = this.trim(params.contact_man);
     mcht.contact_mobile = this.trim(params.contact_mobile);
     mcht.contact_mobile = this.trim(params.contact_mobile);