From 128e967421ce351644b3913ca9be5c0d909609c6 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 29 三月 2024 16:18:35 +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/ApplyChange.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 39fd7bb..4be61b8 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
@@ -113,6 +113,14 @@
@ApiModelProperty(value = "鍙樻洿閲戦")
@ExcelColumn(name="鍙樻洿閲戦")
private BigDecimal fee;
+
+ @ApiModelProperty(value = "鍚堝苟鍗�-鎶曚繚鍗曠姸鎬� 0=鏈笂浼�;1=宸蹭笂浼�;2=宸茬缃�", example = "1")
+ private Integer unionChangeTbdStatus;
+
+ @ApiModelProperty(value = "浜哄憳鍚嶅崟绛剧讲鍚堝悓鍙�")
+ @ExcelColumn(name="浜哄憳鍚嶅崟绛剧讲鍚堝悓鍙�")
+ private String signMemberListNo;
+
@ApiModelProperty(value = "淇濆崟鍙�")
@TableField(exist = false)
private String applyCode;
@@ -152,9 +160,11 @@
private String createDateE;
@ApiModelProperty(value = "鎵瑰崟鐢熸晥璧锋湡鏃堕棿")
+ @TableField(exist = false)
private String applyStartS;
@ApiModelProperty(value = "鎵瑰崟姝㈡晥鏃堕棿")
+ @TableField(exist = false)
private String applyStartE;
@ApiModelProperty(value = "淇濋櫓鏂规涓婚敭")
@@ -210,6 +220,12 @@
@ApiModelProperty(value = "鏂规绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
@TableField(exist = false)
private Integer solutionType;
+
+ @ApiModelProperty(value = "鍚堝苟鍗曚富閿紙淇濆崟锛�")
+ @TableField(exist = false)
+ private Integer unionApplyId;
+
+
public TaxesInvoicingVO toTaxesInvoicingVO(){
TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
taxesInvoicingVO.setId(this.getId());
--
Gitblit v1.9.3