Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 9b1acfe1b5786a3a3e3e849a5729d68fa05c3a1a

Merge branch 'local_20221104' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -10803,7 +10803,7 @@
     * @return 订单详情
     */
    @GetMapping("/shopFlower/orderDetail")
    R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam("phone") String phone);
    R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone);

    /**
     * 根据订单id取消订单

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java

@@ -198,7 +198,7 @@
     * @return 订单详情
     */
    @GetMapping("orderDetail")
    public R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam("phone") String phone) {
    public R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone) {
        return comShopFlowerOrderService.orderDetail(orderId,phone);
    }