Merge branch 'esign-sve-order' of gitlab.gongsibao.com:jiangyong/zhichan into esign-sve-order

esign-sve-order/app/base/db/impl/eorder/eorderDao.js

@@ -96,7 +96,7 @@ class EorderDao extends Dao{
     async getMerchantLiveProduct(merchantId) {
     async getMerchantLiveProduct(merchantId) {
         let sql = [];
         let sql = [];
         sql.push("SELECT");
         sql.push("SELECT");
-        sql.push("t1.id, t1.`engine_account_id`, t2.product_id, t2.price, t1.`merchant_id`");
+        sql.push("t1.id, t1.`engine_account_id`, t2.product_id, t2.price, t1.`merchant_id`, t1.product_type");
         sql.push("FROM e_order t1");
         sql.push("FROM e_order t1");
         sql.push("INNER JOIN `e_order_product` t2 ON t1.`id` = t2.`order_id`");
         sql.push("INNER JOIN `e_order_product` t2 ON t1.`id` = t2.`order_id`");
         sql.push("WHERE t1.`merchant_id` = :merchantId");
         sql.push("WHERE t1.`merchant_id` = :merchantId");