From 9398b7743fa976b016dfbb2b9cf4a04db340508e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 09 十月 2025 11:56:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/vo/BusinessTripDetailVO.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/BusinessTripDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BusinessTripDetailVO.java index 944d4b3..0e99ec6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/BusinessTripDetailVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BusinessTripDetailVO.java @@ -12,7 +12,8 @@ @Data @ApiModel(value = "出差审批详情返回VO") public class BusinessTripDetailVO implements Serializable { - + @ApiModelProperty(value = "是否需要签名 0-否,1-是") + private Boolean signFlag; @ApiModelProperty(value = "申请人") private String userName; @ApiModelProperty(value = "所属部门") @@ -35,6 +36,8 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime endTime; + @ApiModelProperty(value = "是否可以审批") + private Boolean isAudit; @ApiModelProperty(value = "请假/外出/出差/销假时长(天)") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") -- Gitblit v1.7.1