Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-12-08 c9c2b2195e0f6c1e0d2272bf38173570da20175e

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

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

@@ -29,7 +29,7 @@
    <select id="pageDelivery" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerOrderDeliveryVO">
        select * from com_shop_flower_order_delivery where 1=1
        <if test="pageComFlowerOrderDeliveryDTO.deliveryNo != null and pageComFlowerOrderDeliveryDTO.deliveryNo != ''">
            and delivery_no like concat(#{pageComFlowerOrderDeliveryDTO.deliveryNo}, '%' )
            and delivery_no like concat( '%',#{pageComFlowerOrderDeliveryDTO.deliveryNo}, '%' )
        </if>
        <if test="pageComFlowerOrderDeliveryDTO.deliveryStatus != null">
            and delivery_status = #{pageComFlowerOrderDeliveryDTO.deliveryStatus}