Merge branch 'huacheng_push' into huacheng_test

zhaozhengjie

2022-09-09 8cdaf6e5eacd24f6f0691ef8b430c43339f4ac5e

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

@@ -94,8 +94,8 @@
     * @date 2022-03-29 13:17:38
     */
    @GetMapping("/detail")
    public R detailById(@RequestParam("id") Long id) {
        return this.comBatteryCommodityActivityService.detailById(id);
    public R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId) {
        return this.comBatteryCommodityActivityService.detailById(id,userId);
    }

    /**