合并

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.4.1</version>
+	<version>v3.4.2</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/controller/HelpActivityController.java

@@ -478,9 +478,6 @@ public class HelpActivityController extends BaseController {
         return responseBean;
     }
     @ApiOperation(value = "微信端查询拼团和助力推首页的活动的", notes = "微信端查询拼团和助力推首页的活动的")
-    @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "path", value = "活动状态")
-    })
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request) {
             ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request));