productDev/gtzxinglijicun.git

			@@ -33,10 +33,7 @@
			@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
			})
			public ApiResponse<List<Addr>> list() {
			Addr query = new Addr();
			query.setMemberId(getMemberId());
			query.setDeleted(0);
			return ApiResponse.success("查询成功", addrService.findList(query));
			return ApiResponse.success("查询成功", addrService.findListWithArea(getMemberId()));
			}

			@LoginRequired
			@@ -46,7 +43,7 @@
			@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
			})
			public ApiResponse<Addr> findById(@PathVariable Integer id) {
			return ApiResponse.success("查询成功", addrService.findById(id));
			return ApiResponse.success("查询成功", addrService.findByIdWithArea(id));
			}

			@LoginRequired
			@@ -56,9 +53,8 @@
			@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
			})
			public ApiResponse create(@RequestBody Addr addr) {
			addr.setMemberId(getMemberId());
			addrService.create(addr);
			return ApiResponse.success("操作成功");
			addrService.createByMember(addr, getMemberId());
			return ApiResponse.success("操作成功", addrService.findByIdWithArea(addr.getId()));
			}

			@LoginRequired
			@@ -68,9 +64,8 @@
			@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
			})
			public ApiResponse updateById(@RequestBody Addr addr) {
			addr.setMemberId(getMemberId());
			addrService.updateById(addr);
			return ApiResponse.success("操作成功");
			addrService.updateByMember(addr, getMemberId());
			return ApiResponse.success("操作成功", addrService.findByIdWithArea(addr.getId()));
			}

			@LoginRequired
			@@ -94,7 +89,7 @@
			Addr addr = new Addr();
			addr.setId(id);
			addr.setIsDefault(1);
			addrService.updateById(addr);
			addrService.updateByMember(addr, getMemberId());
			return ApiResponse.success("操作成功");
			}
			}