Merge remote-tracking branch 'origin/master'

yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/expenseclaim/vo/ExpenseClaimDetailCreateReqVO.java

@@ -7,6 +7,8 @@ import lombok.ToString;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.HashSet;
+import java.util.Set;
 
 @Schema(description = "管理后台 - 报销单创建 Request VO")
 @Data
@@ -26,4 +28,6 @@ public class ExpenseClaimDetailCreateReqVO {
 
     @Schema(description = "备注", example = "你说的对")
     private String remark;
+
+    private Set<Long> invoiceIds = new HashSet<>();
 }

yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/invoice/vo/InvoiceBaseVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.bs.controller.admin.invoice.vo;
 
+import cn.iocoder.yudao.framework.common.pojo.ImageVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -7,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -55,4 +57,6 @@ public class InvoiceBaseVO {
     @Schema(description = "备注", example = "随便")
     private String remark;
 
+    @Schema(description = "发票附件")
+    private List<ImageVo> files;
 }