Merge remote-tracking branch 'origin/huacheng_test' into local_20221014

yanghui

2022-10-21 5f3cf501f9f6c216df17ee8af6618b55b537d21a

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

@@ -85,8 +85,8 @@
     * @date 2022-03-29 16:06:55
     */
    @GetMapping("/detail")
    public R detailById(@RequestParam("id") Long id) {
        return this.comBatteryCommodityOrderCollageTeamService.detailById(id);
    public R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId) {
        return this.comBatteryCommodityOrderCollageTeamService.detailById(id,userId);
    }

    /**