diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/xfj/HardXfjLogController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/xfj/HardXfjLogController.java index 4b177c760..7c2453740 100755 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/xfj/HardXfjLogController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/xfj/HardXfjLogController.java @@ -18,19 +18,19 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequiredArgsConstructor -@RequestMapping("/xfj-log" ) -@Tag(description = "xfj-log" , name = "消费机日志管理" ) +@RequestMapping("/xfj-log") +@Tag(description = "xfj-log", name = "消费机日志管理") @SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class HardXfjLogController { - private final HardXfjLogService hardXfjLogService; + private final HardXfjLogService hardXfjLogService; /** * 分页查询 */ - @Operation(summary = "分页查询" , description = "分页查询" ) - @GetMapping("/page" ) - @PreAuthorize("@pms.hasPermission('hard_hardXfjLog_view')" ) + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/page") + @PreAuthorize("@pms.hasPermission('hard_hardXfjLog_view')") public R getHardXfjLogPage(@ParameterObject Page page, @ParameterObject HardXfjLogDto dto) { return R.ok(hardXfjLogService.pageList(page, dto)); } @@ -38,10 +38,10 @@ public class HardXfjLogController { /** * 通过id查询消费机日志 */ - @Operation(summary = "通过id查询" , description = "通过id查询" ) - @GetMapping("/{id}" ) - @PreAuthorize("@pms.hasPermission('hard_hardXfjLog_view')" ) - public R getById(@PathVariable("id" ) Long id) { + @Operation(summary = "通过id查询", description = "通过id查询") + @GetMapping("/{id}") + @PreAuthorize("@pms.hasPermission('hard_hardXfjLog_view')") + public R getById(@PathVariable("id") Long id) { return R.ok(hardXfjLogService.getById(id)); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java index eaf97eb95..596135d90 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java @@ -445,7 +445,7 @@ public class HardOrderServiceImpl extends ServiceImpl