[合同][修改][开发账单结算]

mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

@@ -755,7 +755,9 @@
 		rent_shop_type,'[]' shop_info,comments,'' price_detail,updatetime
 		from wx_bill_other_deposit where tenant_id=#{tenantId}
 		) bill
+		where 1=1
 		<if test=" null != status"> and bill.status = #{status} </if>
+		<if test=" null != merchantId">and bill.merchant_id=#{merchantId}</if>
 	</select>