Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-27 2a5dff9ff1af974d6bda826da75ca8073c25013f

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

@@ -55,16 +55,16 @@
                " AND sr.create_at <![CDATA[<=]]> #{pageComShopOrderSearchDTO.createAtEnd} " +
                " </if> " +
                "<if test='pageComShopOrderSearchDTO.orderNo != null  '>" +
                " AND sr.order_no = #{pageComShopOrderSearchDTO.orderNo} " +
                " AND sr.order_no like concat('%', #{pageComShopOrderSearchDTO.orderNo}, '%') " +
                " </if> " +
                "<if test='pageComShopOrderSearchDTO.userAccount != null  '>" +
                " AND su.phone = #{pageComShopOrderSearchDTO.userAccount} " +
                " AND su.phone like concat('%', #{pageComShopOrderSearchDTO.userAccount}, '%') " +
                " </if> " +
                "<if test='pageComShopOrderSearchDTO.receiverAccount != null  '>" +
                " AND uad.name like concat('%', #{pageComShopOrderSearchDTO.receiverAccount}, '%')  " +
                " </if> " +
                "<if test='pageComShopOrderSearchDTO.receiverPhone != null '>" +
                " AND uad.phone = #{pageComShopOrderSearchDTO.receiverPhone} " +
                " AND uad.phone like concat('%',#{pageComShopOrderSearchDTO.receiverPhone}, '%') " +
                " </if> " +
                "<if test='pageComShopOrderSearchDTO.goodsName != null'>" +
                " AND og.goods_name like concat('%',  #{pageComShopOrderSearchDTO.goodsName}, '%') " +