diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java index 6931794..2283472 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java @@ -23,14 +23,14 @@ import java.util.List; * @Date 2025-05-29 */ -@Api(tags = "非工作日饮酒报备单") +@Api(tags = "饮酒报备单") @RestController @RequestMapping("NonWorkingDayDrinkingReport") @RequiredArgsConstructor public class NonWorkingDayDrinkingReportController extends BaseController { private final NonWorkingDayDrinkingReportService nonWorkingDayDrinkingReportService; @ApiOperation("查询非工作日饮酒报备单") - @GetMapping("") + @GetMapping("/list") public TableDataInfo query(NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) { startPage(); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java b/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java index b74e51e..0920f2d 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java @@ -53,13 +53,13 @@ public class NonWorkingDayDrinkingReport { @ApiModelProperty("是否接受下属或地方公安机关宴请(0-否 1-是)") private Integer acceptSubordinateInvite; + @ApiModelProperty("是否出入私人会所或参与一桌餐(0-否 1-是)") + private Integer privateClub; + @ApiModelProperty("审批流程 0-未审批 1-部门审批通过 2-部门审批不通过 3-警务保障部门审批通过 4-警务保障部门审批不通过 5-局领导审批通过 6-局领导审批不通过") @TableField(condition = SqlCondition.EQUAL) private Integer state; - @ApiModelProperty("是否出入私人会所或参与一桌餐(0-否 1-是)") - private Integer privateClub; - @ApiModelProperty("备注说明") private String remark;