Merge remote-tracking branch 'origin/0617' into 0617

smart-city-platform/src/main/resources/mapper/pay/AmountWaterUsedAmountMapper.xml

@@ -438,6 +438,8 @@ SELECT
 	c.site_id siteId
 	from pay_base_customerandmeterrela c
 	where c.businessstate =1
+	and c.customer_id is not null  and c.site_id is not null
+	group by c.customer_id, c.site_id
 	</select>
 
 </mapper>