From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期三, 20 三月 2024 11:37:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1 --- server/service/src/main/java/com/doumee/dao/business/model/Taxes.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java b/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java index 5065cf0..5959744 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java @@ -180,12 +180,17 @@ @TableField(exist = false) private Integer applyId; + @ApiModelProperty(value = "鎾ゅ洖鎿嶄綔浜�") + @TableField(exist = false) + private String cancelUserName; public TaxesInvoicingVO getTaxesInvoicingVO(){ TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO(); taxesInvoicingVO.setId(this.getId()); taxesInvoicingVO.setSolutionsName(this.getSolutionName()); taxesInvoicingVO.setInsuranceCode(this.getInsuranceCode()); + taxesInvoicingVO.setDownCode(this.getDoneCode()); + taxesInvoicingVO.setCreateTime(this.getCreateDate()); taxesInvoicingVO.setAmount(this.getPrice()); taxesInvoicingVO.setType(Constants.TWO); return taxesInvoicingVO; -- Gitblit v1.9.3