Commit 7343bdf7 by 孙亚楠

dd

parent 65187f70
...@@ -97,7 +97,7 @@ class SaasMerchantDao extends Dao { ...@@ -97,7 +97,7 @@ class SaasMerchantDao extends Dao {
var sql = []; var sql = [];
sql.push("SELECT"); sql.push("SELECT");
sql.push("t1.*,"); sql.push("t1.*,");
sql.push("t2.main_id, t2.begin_date, t2.end_date, t2.bm_reg_price, t2.invoice_service_rate, t2.trans_service_rate "); sql.push("t2.main_id,t2.main_id_trade,t2.main_id_invoice, t2.begin_date, t2.end_date, t2.bm_reg_price, t2.invoice_service_rate, t2.trans_service_rate ");
sql.push("FROM saas_merchant t1"); sql.push("FROM saas_merchant t1");
sql.push("INNER JOIN saas_merchant_sign t2 ON t1.id = t2.id"); sql.push("INNER JOIN saas_merchant_sign t2 ON t1.id = t2.id");
sql.push("WHERE 1 = 1 "); sql.push("WHERE 1 = 1 ");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment