[合同][修改][多经选择商铺添加商户查询条件]

mallinkService/src/main/java/com/iformall/domain/po/WxShop.java

@@ -31,6 +31,9 @@ public class WxShop extends BaseEntity {
 	@TableField(exist = false)
 	private String linkPhone;
 
+    @TableField(exist = false)
+    private String merchantName;
+
 	@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
 	private String tenantId;
 

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

@@ -517,6 +517,11 @@
         <if test=" null != building and '' != building ">
             and b.building_name  like concat('%', #{building},'%')
         </if>
+    
+        <if test=" null != merchantName and ''!=merchantName ">
+            and m.`name` like concat('%', #{merchantName},'%')
+        </if>
+    
         <if test=" null != sortColumns">order by ${sortColumns}</if>
     </select>