Merge branch 'master' of code.sz-chaohui.cn:miaoweiw/wios

src/main/java/com/starcharge/wios/dao/mappers/SupplierMapper.xml

@@ -347,7 +347,7 @@
 	   a.account as accountName from t_supplier t
 	   left join wb_account a on a.id=t.account_id
 	   <if test="hasContract != null"><!-- 是否签了合同 -->
-	       left join t_supplier_contract sc on sc.supplier_id=t.id 
+	       left join T_SUPPLIER_CONTRACT sc on sc.supplier_id=t.id
 	       <if test="hasContract == 1">
 	       	and sc.status=2
 	       </if>