Merge branch 'center-app' of http://gitlab.gongsibao.com/jiangyong/zhichan into center-app

center-app/app/base/db/impl/dbproduct/productDao.js

@@ -29,7 +29,10 @@ class ProductDao extends Dao {
         "icon_url",
         "icon_url",
         "pay_after_jump_h5url",
         "pay_after_jump_h5url",
         "pay_after_jump_pcurl",
         "pay_after_jump_pcurl",
-        "productType_id"],
+        "productType_id",
+        "pc_pic_url",
+        "pc_desc_url"
+      ],
       raw: true
       raw: true
     });
     });
   }
   }

center-app/app/base/db/metadata/apps/platform.js

@@ -34,7 +34,7 @@ module.exports = {
                 "pushOrderBusiness": "推送订单商机", "pushOrderRefund": "推送订单退款", "pushNeedBusiness": "推送需求商机", "pushNeedNote": "推送需求小计",
                 "pushOrderBusiness": "推送订单商机", "pushOrderRefund": "推送订单退款", "pushNeedBusiness": "推送需求商机", "pushNeedNote": "推送需求小计",
                 "pushCloseNeed": "推送关闭需求", "pushNeedSolution": "推送需求方案", "pushCloseNeedSolution": "推送关闭需求方案", "pushOpSolution": "推送操作方案",
                 "pushCloseNeed": "推送关闭需求", "pushNeedSolution": "推送需求方案", "pushCloseNeedSolution": "推送关闭需求方案", "pushOpSolution": "推送操作方案",
                 "createAliTmApply": "推送创建阿里商标申请", "closeAliTmApply": "推送主动关闭阿里商标申请", "updateAliTmApplicant": "推送更新阿里商标申请人信息", 
                 "createAliTmApply": "推送创建阿里商标申请", "closeAliTmApply": "推送主动关闭阿里商标申请", "updateAliTmApplicant": "推送更新阿里商标申请人信息", 
-                "pushRePurchaseBusiness": "复购商机推送"
+                "pushRePurchaseBusiness": "复购商机推送","pushDeliveryOrder": "推送交付系统订单","pushDeliveryStatusNotify": "推送交付系统交付状态更新"
             },
             },
             //---------
             //---------