From dc3cfa57c400ded43fdac3a73c7be27a18a90b23 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 28 三月 2024 15:57:47 +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/InsuranceApply.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 36ade21..fa689c9 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -108,6 +108,9 @@
@ExcelColumn(name="鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_apply)")
private Integer unionApplyId;
+ @ApiModelProperty(value = "鍚堝苟鍗�-鎶曚繚鍗曠姸鎬� 0=鏈笂浼�;1=宸蹭笂浼�;2=宸茬缃�", example = "1")
+ private Integer unionApplyTbdStatus;
+
@ApiModelProperty(value = "鍗曞彿")
@ExcelColumn(name="鍗曞彿")
private String code;
@@ -126,6 +129,14 @@
@ApiModelProperty(value = "鎬昏垂鐢�")
@ExcelColumn(name="鎬昏垂鐢�")
private BigDecimal fee;
+
+ @ApiModelProperty(value = "鍦ㄧ嚎纭涔﹀悎鍚屽彿")
+ @ExcelColumn(name="鍦ㄧ嚎纭涔﹀悎鍚屽彿")
+ private String signQrsNo;
+
+ @ApiModelProperty(value = "浜哄憳鍚嶅崟绛剧讲鍚堝悓鍙�")
+ @ExcelColumn(name="浜哄憳鍚嶅崟绛剧讲鍚堝悓鍙�")
+ private String signMemberListNo;
@ApiModelProperty(value = "浼佷笟鍚嶇О")
@TableField(exist = false)
@@ -222,6 +233,13 @@
@TableField(exist = false)
private Integer newVersionSolutionId;
+
+ @ApiModelProperty(value = "鍟嗘埛鍚嶇О")
+ @TableField(exist = false)
+ private String shopName;
+
+
+
public TaxesInvoicingVO toTaxesInvoicingVO(){
TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
taxesInvoicingVO.setId(this.getId());
--
Gitblit v1.9.3