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

coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java

@@ -11,4 +11,7 @@ import java.util.List;
 public interface ApplyLicenseMapper extends Mapper<LicenseTransactDO> {
 
     List<LicenseListResponse> licenseList(@Param("request") LicenseListRequest request);
+
+    void updateByShopId(@Param("entity") LicenseTransactDO licenseTransactDO);
+
 }

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

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cool.store.mapper.ApplyLicenseMapper">
+    <update id="updateByShopId">
+        update xfsg_license_transact
+        set submit_status = #{entity.submitStatus}
+        where shop_id = #{entity.shopId}
+    </update>
 
 
     <select id="licenseList" resultType="com.cool.store.response.LicenseListResponse">

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

@@ -435,7 +435,7 @@
 
   <select id="publicLineList" resultMap="BaseResultMap">
     select * from xfsg_line_info
-    where  deleted = 0 and line_status = 0 and join_status = 0
+    where  deleted = 0 and line_status = 0
     <if test="publicFlag">
       and investment_manager is not null
     </if>