From 22271e641e4505ba906c3770905b7e84e3ad8d85 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 02 四月 2024 17:05:57 +0800 Subject: [PATCH] mrshi --- server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java index 75d793f..a9025e9 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java @@ -95,9 +95,9 @@ @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡") @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡") //鍏ュ弬 - @DateTimeFormat(pattern = "yyyy-MM-dd") - //鍑哄弬 - @JsonFormat(pattern="yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// //鍑哄弬 +// @JsonFormat(pattern="yyyy-MM-dd") private Date validTime; @ApiModelProperty(value = "鎵瑰崟鍙�") @@ -152,10 +152,19 @@ @ApiModelProperty(value = "淇濋櫓鏂规涓婚敭") @TableField(exist = false) private Integer solutionsId; - - @ApiModelProperty(value = "鍩鸿〃淇濋櫓鏂规涓婚敭") + @ApiModelProperty(value = "淇濋櫓鏂规涓婚敭(鍩鸿〃锛�") @TableField(exist = false) private Integer baseSolutionsId; + @ApiModelProperty(value = "鐢宠鍗曢檮浠�") + @TableField(exist = false) + private Multifile applyFile; + @ApiModelProperty(value = "鐢宠鍗曟崲鍘傞檮浠�") + @TableField(exist = false) + private Multifile applyUnitFile; + @ApiModelProperty(value = "鎵瑰崟闄勪欢") + @TableField(exist = false) + private Multifile pidanFile; + @ApiModelProperty(value = "鍔犱繚鏄庣粏鏁版嵁") @TableField(exist = false) @@ -174,9 +183,6 @@ @TableField(exist = false) private Integer companyId; - @ApiModelProperty(value = "鎵瑰崟闄勪欢瀵硅薄") - @TableField(exist = false) - private Multifile pidanFile; @ApiModelProperty(value = "澶勭悊浼佷笟鐢宠鐘舵�� 0鍚屾剰 1椹冲洖") @TableField(exist = false) private int dealBackApply; @@ -187,10 +193,12 @@ @ApiModelProperty(value = "淇濋櫓鐢熸晥姝㈡湡") @TableField(exist = false) private Date endTime; - - - - + @ApiModelProperty(value = "鏂规閭欢") + @TableField(exist = false) + private String solutionEmail; + @ApiModelProperty(value = "鏃ュ織璁板綍") + @TableField(exist = false) + private List<ApplyLog> applyLogList; public TaxesInvoicingVO toTaxesInvoicingVO(){ TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO(); taxesInvoicingVO.setId(this.getId()); -- Gitblit v1.9.3