Merge branch 'master' into cc_20250529_login

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

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

@@ -297,4 +297,14 @@ public class ShopInfoDAO {
         example.createCriteria().andIn("partnerId", partnerIds).andEqualTo("deleted", false);
         return shopInfoMapper.selectByExample(example);
     }
+    /**
+     * @Auther: wangshuo
+     * @Date: 2025/5/29
+     * @description: 获取门店列表，根据门店状态
+     */
+    public List<ShopInfoDO> selectByShopStatus(Long lineId,List<Integer> shopStatus){
+        Example example = new Example(ShopInfoDO.class);
+        example.createCriteria().andEqualTo("lineId", lineId).andIn("shopStatus", shopStatus).andEqualTo("deleted", false);
+        return shopInfoMapper.selectByExample(example);
+    }
 }

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

@@ -76,7 +76,7 @@
         </foreach>
     </select>
     <select id="getSignType" resultType="com.cool.store.entity.SignFranchiseDO">
-        select shop_id as shopId, sign_type as signType from xfsg_sign_franchise
+        select shop_id as shopId, sign_type as signType,partnership_signatory_second as partnershipSignatorySecond from xfsg_sign_franchise
         where
         shop_id in
         <foreach collection="list" separator="," item="item" index="index" open="(" close=")">