Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -445,7 +445,7 @@ public class OrgPersonController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/people/firefighter/{id}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/people/firefighter/{id}/{type}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public ResponseModel<String> deleteFirefighterPeopleById(@PathVariable Long id,@PathVariable String type) {
         return ResponseHelper.buildResponse(iOrgUsrService.deleteFirefighterPeopleById(id,type));