Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-21 c5f9d214b2d63506cfbab5cc977610da3b133ec4

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

@@ -72,7 +72,7 @@
     * @date 2022-03-29 16:07:00
     */
    @GetMapping("/detail")
    R detailById(@RequestParam("id") Long id);
    R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId);

    /**
     * description  queryByList  查询列表