Merge remote-tracking branch 'origin/master'

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/mapper/xml/HlwCompanyAccountDetailMapper.xml

@@ -900,9 +900,8 @@
 		ifnull(p.payment_code,'') AS "paymentCode"
 		FROM hlw_company_account_detail a
 		<include refid="hlwCompanyAccountDetailJoins"/>
-		left join hlw_company_account hca on hca.id = a.company_account_id
 		<where>
-			hca.company_id = #{hlwCompanyAccount.companyId}
+			a.company_account_id = #{hlwCompanyAccount.id}
 			<if test="hlwCompanyAccount.type != null">
 				and a.type = #{hlwCompanyAccount.type}
 			</if>