修复

1：修改XML错误

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/MerchantProdMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectMerchantProd"/>
         <where>  
             <if test="mercId != null "> and mercId = #{mercId}</if>
+            <if test="mercProdId != null "> and mercProdId = #{mercProdId}</if>
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
             <if test="shelfTime != null "> and shelfTime = #{shelfTime}</if>