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

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

@@ -149,6 +149,12 @@
       </foreach>
     </if>
   </select>
+  <select id="getRegionIdByShopCode" resultType="java.lang.Long">
+    select r.parent_id
+    from xfsg_shop_info xsi
+           join region_${enterpriseId} r on r.id = xsi.region_id
+    where xsi.shop_code = #{shopCode}
+  </select>
 
 
 </mapper>

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

@@ -0,0 +1,4 @@
+<?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.SignFranchiseMapper">
+</mapper>