Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -35,6 +35,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.reservation.ReservationStatusConstant;
 import org.springblade.common.utils.AddressUtil;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -68,6 +69,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 @RequestMapping("/reservation")
 @Api(value = "预约列表", tags = "预约列表接口")
+@Slf4j
 public class DistributionReservationController extends BladeController {
 
 	private final IDistributionReservationService reservationService;
@@ -111,7 +113,9 @@ public class DistributionReservationController extends BladeController {
 		}
 		IPage<DistributionReservationEntity> pages = reservationService.page(Condition.getPage(query),lambda );
 		pages.getRecords().forEach(i ->{
+			log.info("查询用户》》》》》",i.getCreateUser());
 			R<User> userR = userClient.userInfoById(i.getCreateUser());
+			log.info("查询用户结果》》》》》",userR.getData().getName());
 			i.setOperator(userR.getData().getName());
 		});