Merge branch 'test_warehouse' of http://gitlab.nhys.cdnhxx.com/root/zhihuis...

101captain

2021-10-13 443b189967b36ac044ddd7dcb54f7140be87968a

Merge branch 'test_warehouse' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test_warehouse

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseDonatesMapper.xml

@@ -85,7 +85,7 @@
        <if test="pageDonatesDTO.keyword != null and pageDonatesDTO.keyword != &quot;&quot;">
            <if test="pageDonatesDTO.isWhich != null">
                AND status = 2
                AND `name` LIKE CONCAT('%', #{pageDonatesDTO.keyword}, '%')
                AND item LIKE CONCAT('%', #{pageDonatesDTO.keyword}, '%')
            </if>
            <if test="pageDonatesDTO.isWhich == null">
                AND (