Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/oms into develop

src/main/java/com/mmc/oms/controller/UserAddressController.java

@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -26,46 +25,47 @@ import java.util.List;
 @RestController
 @RequestMapping("/user-address/")
 @Api(tags = {"地址管理"})
-public class UserAddressController extends BaseController{
+public class UserAddressController extends BaseController {
     @Autowired
     private UserAddressService userAddressService;
 
     /**
      * 添加地址
+     *
      * @param request
      * @param param
      * @return
      */
     @ApiOperation(value = "新增用户地址")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("insert")
     public ResultBody insert(HttpServletRequest request, @RequestBody @Validated(Insert.class) UserAddressVO param) {
-        return userAddressService.insert(param,this.getCurrentAccount(request));
+        return userAddressService.insert(param, this.getCurrentAccount(request));
     }
 
     @ApiOperation(value = "编辑用户地址")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("update")
     public ResultBody update(@RequestBody @Validated(Update.class) UserAddressVO param, HttpServletRequest request) {
-        return userAddressService.update(param,this.getCurrentAccount(request));
+        return userAddressService.update(param, this.getCurrentAccount(request));
     }
 
     @ApiOperation(value = "删除用户地址-根据id")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("deleteById")
-    public ResultBody deleteById(Integer id){
+    public ResultBody deleteById(Integer id) {
         return userAddressService.deleteById(id);
     }
 
     @ApiOperation(value = "根据id查询地址")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = UserAddressDTO.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserAddressDTO.class)})
     @GetMapping("getUserAddressInfo")
-    public ResultBody getUserAddressInfo(@RequestParam Integer userAddressId){
+    public ResultBody getUserAddressInfo(@RequestParam Integer userAddressId) {
         return ResultBody.success(userAddressService.getUserAddressInfo(userAddressId));
     }
 
     @ApiOperation(value = "查询用户地址列表-条件查询")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = UserAddressDTO.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserAddressDTO.class)})
     @PostMapping("selectList")
     public ResultBody<List<UserAddressDTO>> selectList(@RequestBody UserAddressQO param, HttpServletRequest request) {
         return userAddressService.selectList(param, this.getCurrentAccount(request));