Merge remote-tracking branch 'origin/master'

CeDo

2021-04-27 a3aa71fd0ba1b48fe52f080e8d2776f50c5ed514

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java

@@ -20,9 +20,9 @@

    @Select("<script>" +
            "select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`," +
            "sale,sale_volume,store_detail,create_at from com_shop_store c" +
            "sale,sale_volume,store_detail,create_at, store_describe from com_shop_store c" +
            " <where>" +
            "c.delete_status=1" +
            "c.delete_status=1 and c.status = 1" +
            "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != &quot;&quot;'>" +
            "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" +
            " </if> " +
@@ -45,7 +45,7 @@

    @Select("<script>" +
            "select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`," +
            "sale,sale_volume,store_detail,create_at from com_shop_store c" +
            "sale,sale_volume,store_detail,create_at,store_describe from com_shop_store c" +
            " <where>" +
            " and c.delete_status=1 " +
            "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != &quot;&quot;'>" +