Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b

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

    /**