Merge branch 'master' of zj/kmall-pt into master

kmall-admin/src/main/java/com/kmall/admin/dao/MerchDao.java

@@ -13,4 +13,11 @@ import com.kmall.common.dao.BaseDao;
 public interface MerchDao
         extends BaseDao<MerchEntity> {
 
+    /**
+     * 根据商户编号查询商户信息
+     *
+     * @param merchSn 商户编号
+     * @return 商户信息
+     */
+    MerchEntity findByMerchSn(String merchSn);
 }

kmall-admin/src/main/resources/mybatis/mapper/MerchDao.xml

@@ -39,6 +39,26 @@
 		where id = #{id}
 	</select>
 
+	<select id="findByMerchSn" resultType="com.kmall.admin.entity.MerchEntity">
+		select
+			`id`,
+			`merch_sn`,
+			`merch_name`,
+			`merch_short_name`,
+			`merch_img`,
+			`sort_order`,
+			`is_show`,
+			`remark`,
+			`creater_sn`,
+			`create_time`,
+			`moder_sn`,
+			`mod_time`,
+			`tstm`,
+			`is_show` as `show`
+		from mall_merch
+		where merch_sn = #{merchSn}
+	</select>
+
 	<select id="queryList" resultType="com.kmall.admin.entity.MerchEntity">
 		select
     		`id`,