From a4fc9ef5d32a062a664bda212f9e50632e1b7a86 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 三月 2024 14:34:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 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 69961ec..8732783 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
@@ -46,7 +46,6 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -180,15 +179,40 @@
     @ApiModelProperty(value = "澶勭悊浼佷笟鐢宠鐘舵��  0鍚屾剰 1椹冲洖")
     @TableField(exist = false)
     private int dealBackApply;
-    @ApiModelProperty(value = "鐘舵�� 0寰呭鎵� 1寰呭嚭鍗� 2淇濋殰涓�  3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
+    @ApiModelProperty(value = "鐘舵�� 0寰呭鏍� 1寰呭嚭鍗� 2淇濋殰涓�  3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
     @TableField(exist = false)
     private Integer statusCollect;
     @ApiModelProperty(value = "闆嗗悎鐘舵��" , example = "1")
     @TableField(exist = false)
     private String statusInfo;
 
+    @ApiModelProperty(value = "鏈�鍚庝竴娆″姞鍑忎繚/鎹㈠巶鏃ユ湡")
+    @TableField(exist = false)
+    private Date lastChangeDate;
 
 
+    @ApiModelProperty(value = "鏈�浣庡勾榫�", example = "1")
+    @TableField(exist = false)
+    private Integer minAge;
+
+    @ApiModelProperty(value = "鏈�楂樺勾榫�", example = "1")
+    @TableField(exist = false)
+    private Integer maxAge;
+
+
+    @ApiModelProperty(value = "淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
+    @TableField(exist = false)
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
+    @TableField(exist = false)
+    private Integer timeUnit;
+
+
+    @ApiModelProperty(value = "鏈�鏂扮増鏈殑鏂规涓婚敭", example = "1")
+    @TableField(exist = false)
+    private Integer newVersionSolutionId;
+
     public TaxesInvoicingVO toTaxesInvoicingVO(){
         TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
         taxesInvoicingVO.setId(this.getId());

--
Gitblit v1.9.3