Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseBasicMapper.xml

@@ -58,7 +58,7 @@
 
 			left join
 			(select sum(collect_number) as collect_number,goods_name,status from material_management_collect_detailed e
-			left join material_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0) g
+			left join material_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0 GROUP BY e.goods_name) g
 			on a.trade_name = g.goods_name and g.status = 5
 
 			left join cw_reimbursement_type_info d on a.ware_house_type = d.id