Merge branch 'bpo-stat' of gitlab.gongsibao.com:jiangyong/zhichan into bpo-stat

bpo-stat/app/base/db/models/all/merchant.js

@@ -88,6 +88,10 @@ module.exports = function(sequelize, DataTypes) {
     redundance_4: {
     redundance_4: {
       type: DataTypes.STRING(255),
       type: DataTypes.STRING(255),
       allowNull: true
       allowNull: true
+    },
+    contract_url: {
+      type: DataTypes.STRING(30),
+      allowNull: true
     }
     }
   }, {
   }, {
     tableName: 'merchant_info'
     tableName: 'merchant_info'

bpo-stat/app/base/service/impl/all/merchantSve.js

@@ -35,7 +35,7 @@ class MerchantService extends ServiceBase {
         var orderby = [
         var orderby = [
             ["id", 'desc']
             ["id", 'desc']
         ];
         ];
-        var attributes = [`id`, `company_name`, `type`, `link_man`, `link_no`, `link_email`, `bank_account_name`, `bank_no`, `open_bank`, `sign_body`, `begin_time`, `invalid_time`];
+        var attributes = [`id`, `company_name`, `type`, `link_man`, `link_no`, `link_email`, `bank_account_name`, `bank_no`, `open_bank`, `sign_body`, `begin_time`, `invalid_time`,`contract_url`];
         var page = await this.getPageList(currentPage, pageSize, where, orderby, attributes);
         var page = await this.getPageList(currentPage, pageSize, where, orderby, attributes);
         if (page && page.rows) {
         if (page && page.rows) {
             for (var row of page.rows) {
             for (var row of page.rows) {

bpo-stat/app/config/localsettings.js

@@ -6,16 +6,16 @@ var settings={
     db:10,
     db:10,
   },
   },
   database:{
   database:{
-    // dbname : "stat",
-    // user: "root",
-    // password: "!@#Qaz741",
-    // config: {
-    //   host: 'rm-2ze5muw8tb37i3ig4lo.mysql.rds.aliyuncs.com',
-    dbname : "bpo_stat",
-    user: "write",
-    password: "write",
+    dbname : "stat",
+    user: "root",
+    password: "!@#Qaz741",
     config: {
     config: {
-      host: '192.168.18.237',
+      host: 'rm-2ze5muw8tb37i3ig4lo.mysql.rds.aliyuncs.com',
+    // dbname : "bpo_stat",
+    // user: "write",
+    // password: "write",
+    // config: {
+    //   host: '192.168.18.237',
       port: 3306,
       port: 3306,
       // host: '43.247.184.35',
       // host: '43.247.184.35',
       // port: 8899,s
       // port: 8899,s