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

coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml

@@ -128,13 +128,16 @@
   <select id="ListByCondition" resultType="com.cool.store.dto.Preparation.PreparationDTO">
     select
     a.id as id,
+    a.line_id as lineId,
     a.shop_name  as shopName,
     a.store_num as storeNum,
     a.shop_manager_user_id  as shopManagerUserId,
+    a.supervisor_user_id as supervisorUserId,
     a.region_id as regionId,
     a.plan_open_time as planOpenTime,
     b.username as username,
-    b.mobile as mobile
+    b.mobile as mobile,
+    b.investment_manager as investmentManager
     from xfsg_shop_info a left join xfsg_line_info b on a.line_id = b.id
     where a.deleted = 0
     <if test="request.keyword != null and request.keyword != ''">