Merge branch 'ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into ic-deliver

ic-deliver/app/base/db/models/delivery/delivery_bill.js

@@ -106,7 +106,19 @@ module.exports = (db, DataTypes) => {
     salesman_phone: { // 业务员联系方式
       allowNull: true,
       type: DataTypes.STRING
-    }
+    },
+    delivery_man_id: {// 交付员id
+      allowNull: true,
+      type: DataTypes.STRING
+    },
+    delivery_man_name: {// 交付员姓名
+      allowNull: true,
+      type: DataTypes.STRING
+    },
+    delivery_man_opcode: {// 交付员opcode
+      allowNull: true,
+      type: DataTypes.STRING
+    },
 
   }, {
     paranoid: false,//假的删除

ic-deliver/app/config/settings.js

@@ -9,10 +9,14 @@ var ENVINPUT = {
   REDIS_PORT: process.env.REDIS_PORT,
   REDIS_PWD: process.env.REDIS_PWD,
   REDIS_DB: process.env.PAAS_REDIS_DB,
-  APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev"
+  APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev",
+  ENCRYPT_KEY: process.env.ENCRYPT_KEY ? process.env.ENCRYPT_KEY : "202007211106",
+  ENCRYPT_SECRET: process.env.ENCRYPT_SECRET ? process.env.ENCRYPT_SECRET : "scbb846246874887b5c7e01cd0816c66"
 };
 var settings = {
   env: ENVINPUT.APP_ENV,
+  encrypt_key: ENVINPUT.ENCRYPT_KEY,
+  encrypt_secret: ENVINPUT.ENCRYPT_SECRET,
   salt: "%iatpD1gcxz7iF#B",
   defaultpwd: "gsb2020",
   basepath: path.normalize(path.join(__dirname, '../..')),