From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +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 | 8 ++++++++
1 files changed, 8 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 aeabdaa..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
@@ -176,13 +176,21 @@
@TableField(exist = false)
List<TaxDetial> delTaxList ;//
+ @ApiModelProperty(value = "淇濆崟涓婚敭 - 鏌ヨ淇濆崟鐨勫紑绁ㄥ巻鍙茶褰�")
+ @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