Merge branch 'xggsve-invoice-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-invoice-dev

xggsve-invoice/app/base/db/impl/invoice/iinvoicedeliverDao.js

@@ -41,7 +41,7 @@ class IinvoicedeliverDao extends Dao {
     var sql = [];
     var sql = [];
     sql.push("SELECT");
     sql.push("SELECT");
     sql.push("t1.`product_id`, ");
     sql.push("t1.`product_id`, ");
-    sql.push("t1.`apply_no`, t1.`invoice_type`, t1.`invoice_join`, t1.`invoice_amount`, ");
+    sql.push("t1.`apply_no`, t1.`invoice_type`, t1.`invoice_amount`, ");
     sql.push("t1.`apply_time`, t1.invoice_time, t1.`created_at`, t1.`status`, ");
     sql.push("t1.`apply_time`, t1.invoice_time, t1.`created_at`, t1.`status`, ");
     sql.push("t1.`merchant_name`, t1.businessmen_name");
     sql.push("t1.`merchant_name`, t1.businessmen_name");
     sql.push("FROM i_invoice_deliver t2");
     sql.push("FROM i_invoice_deliver t2");