Merge branch 'refs/heads/cc_partner_init_zhuangxiu' into cc_partner_init

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml

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

@@ -479,5 +479,19 @@
       and (username like #{request.keyword} or mobile like #{request.keyword})
     </if>
   </select>
+  <select id="getLines" resultType="com.cool.store.dto.openPlan.PlanLineDTO">
+    select  xli.id as lineId, xli.mobile as mobile, xli.username as username, eu.name as name
+    from xfsg_line_info xli
+    join enterprise_user_${enterpriseId}  eu on xli.investment_manager = eu.user_id
+    where  deleted = 0 and join_status = 1 and line_status = 1
+    <if test=" lineIdList != null and lineIdList.size>0">
+      and  id in
+      <foreach collection="lineIdList" item="lineId" open="(" separator="," close=")">
+        #{lineId}
+      </foreach>
+    </if>
+
+  </select>
+
 
 </mapper>