Merge branch 'master' into cc_20250527_desk

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java

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

@@ -37,7 +37,10 @@
         update_time,
         deleted,
         two_certificates_one,
-        legal_is_same_partner
+        legal_is_same_partner,
+        single_shop,
+        commitment_url,
+        food_shop_list_url
     </sql>
     <update id="updateByShopId">
         update xfsg_license_transact

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

@@ -30,6 +30,7 @@
         <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
         <result property="poi" column="poi" jdbcType="VARCHAR"/>
         <result property="storeId" column="store_id" jdbcType="VARCHAR"/>
+        <result property="dyMobile" column="dy_mobile" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -40,6 +41,6 @@
         settler_bank_name,
         account,store_positioning_url,authorization_url,
         create_time,update_time,create_user,
-        update_user,poi,store_id
+        update_user,poi,store_id,dy_mobile
     </sql>
 </mapper>

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

@@ -26,4 +26,15 @@
             values (#{item.shopId},#{item.type},#{item.account},#{item.password},#{item.remark},#{item.createTime},#{item.createUser})
         </foreach>
     </insert>
+    <update id="batchUpdateYlsRemarkByShopCode">
+        UPDATE xfsg_pos_and_order_info a LEFT JOIN xfsg_shop_info b on a.`shop_id` = b.id
+        SET
+        a.remark = #{remark}
+        WHERE
+        b.`shop_code` in(
+        <foreach collection="list" item="item" separator=",">
+            #{item}
+        </foreach>
+        ) AND a.type = 2
+    </update>
 </mapper>