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

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -39,6 +39,7 @@ class DeliverybillCtl extends CtlBase {
         robj.deliverNumber = element.delivery_code;//交付单编号
         robj.businessName = element.product_name;//产品名称
         robj.businessType = element.product_code;//产品编码
+        robj.product_code = element.product_code;//产品编码
         robj.sourceName = element.source_name;//渠道来源
         robj.source_name = element.source_name;//渠道来源--前端服务
         robj.channelNumber = element.source_number;//渠道编码

ic-deliver/app/config/settings.js

@@ -4,7 +4,7 @@ var ENVINPUT = {
   DB_PORT: process.env.DB_PORT,
   DB_USER: process.env.DB_USER,
   DB_PWD: process.env.DB_PWD,
-  DB_NAME: process.env.PAAS_DB_NAME,
+  DB_NAME: process.env.DELIVERY_DB_NAME,
   REDIS_HOST: process.env.REDIS_HOST,
   REDIS_PORT: process.env.REDIS_PORT,
   REDIS_PWD: process.env.REDIS_PWD,