Merge branch 'test'

CeDo

2021-05-11 757e5dc619ddf01fbd9ec2c8c75b6663d79835cb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java

@@ -50,11 +50,10 @@

    /**
     * 根据订单id取消订单
     * @param orderId   订单id
     * @param phone 操作用户手机号
     * @param comShopOrderQueryDTO   订单信息
     * @return  取消结果
     */
    R orderCancel(Long orderId,String phone);
    R orderCancel(ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 根据订单id删除订单