Merge branch 'release_real_202008' of https://git.youlane.cn/server/formallProject into release_real_202008

mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

@@ -214,6 +214,9 @@
         <if test=" null != status ">
             and `status` = #{status}
         </if>
+        <if test=" null != type ">
+            and `type` = #{type}
+        </if>
         order by create_date desc
     </select>