Commit ad8d78c2c1beb468e04cd52db60d63341c250e7f

Authored by 房远帅
2 parents 7494d637 1b483340

Merge branch 'master_after20' into master_cj_zq

@@ -156,7 +156,7 @@ @@ -156,7 +156,7 @@
156 FROM customer_credit AS tb 156 FROM customer_credit AS tb
157 left join base_data_customer as cu on cu.id = tb.company_id 157 left join base_data_customer as cu on cu.id = tb.company_id
158 left join sys_dept d on tb.region = d.id 158 left join sys_dept d on tb.region = d.id
159 - left join sys_dept d1 on tb.dept_id = d.id 159 + left join sys_dept d1 on tb.dept_id = d1.id
160 </sql> 160 </sql>
161 161
162 <select id="query" resultMap="CustomerCredit"> 162 <select id="query" resultMap="CustomerCredit">