Merge branch 'master' of http://git.ycjcjy.com/civilized_city/service

src/main/java/com/example/civilizedcity/controller/TdLocTypeController.java

     @PutMapping("/tdLocType/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdLocType tdLocType,
                             @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+        tdLocType.setTypeId(id);
         tdLocTypeService.updateById(tdLocType);
         return ResponseBean.success(tdLocType);
     }