[日常账单][修改][选择店铺]

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

@@ -196,8 +196,8 @@
 	
 	<select id="getRentContractList" parameterType="com.iformall.domain.po.WxRentContract"
 	        resultType="com.iformall.domain.po.WxRentContract">
-		select s.shop_number,s.building_name building, s.floor_name floor,s.build_area,rc.* from (
-		select ms.merchant_id,s.shop_number,b.building_name,f.floor_name,s.build_area
+		select s.shop_id,s.shop_number,s.building_name building, s.floor_name floor,s.build_area,rc.* from (
+		select s.id shop_id,ms.merchant_id,s.shop_number,b.building_name,f.floor_name,s.build_area
 		from wx_shop s
 		left join wx_mall_building b  on s.building=b.id
 		left join wx_mall_floor f on s.floor=f.id