Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 c168f544ecd041760e7d0fba66c48e06b9ab67dc

 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);
    }