Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryMapper.xml

@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select aa.inquiry_id, aa.area_id, aa.inquiry_code, aa.title, aa.start_time, aa.end_time, aa.status, aa.bid_time,
                aa.request_arrival_time, aa.inquiry_notes, aa.phone, aa.link_man, aa.address, aa.bid_total_price, aa.supplier_id,
                bb.area_name as area, aa.create_by, aa.create_time, aa.update_by, aa.update_time,dd.supplier_name  as supplier_name,
-               aa.bid_total_price,GROUP_CONCAT(dd.supplier_name) as supplier_names
+               aa.bid_total_price,GROUP_CONCAT(dd.supplier_name) as supplier_names,GROUP_CONCAT(dd.supplier_id) AS supplier_ids
         from ims_inquiry aa
                  left join basic_area bb on aa.area_id=bb.area_id
                  left join ims_inquiry_supplier cc on aa.inquiry_id=cc.inquiry_id