Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

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

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

    /**
     * description  queryByList  查询列表