From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 04 七月 2025 17:56:41 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java | 71 +++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java index f52f696..f16575c 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java @@ -72,8 +72,10 @@ @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡") @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index =8,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss") private Date startTime; + @ApiModelProperty(value = "鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_apply)", example = "1") private Integer unionApplyId; + @ApiModelProperty(value = "韬唤璇佸彿鐮�") @ExcelColumn(name="韬唤璇佸彿鐮�",index = 5,width = 12) private String idcardNo; @@ -90,6 +92,10 @@ @ExcelColumn(name="璐圭敤",index = 10,width = 5) private BigDecimal fee; + + @ApiModelProperty(value = "鍗曚环", example = "1") + private BigDecimal price; + @ApiModelProperty(value = "鎬у埆 0=鐢�;1=濂�", example = "1") @ExcelColumn(name="鎬у埆",index =4,valueMapping = "0=鐢�;1=濂�;",width = 3) private Integer sex; @@ -102,6 +108,19 @@ // @ExcelColumn(name="鏉ユ簮涓婚敭锛坅pply_chagne_detail锛夊姞鍑忎繚鐢熸垚瀛樺湪") private Integer fromId; + @ApiModelProperty(value = "鍑忓皯璐圭敤") +// @ExcelColumn(name="褰撳墠璐圭敤") + private BigDecimal reduceMoney; + + @ApiModelProperty(value = "鍔犱繚涓氬姟缁戝畾鐨勫噺淇濇暟鎹富閿�") +// @ExcelColumn(name="褰撳墠璐圭敤") + private Integer reduceId; + + @ApiModelProperty(value = "鍔犲噺淇濇暟鎹姸鎬侊細0=姝e父锛�1=涓嶅彲鍑忎繚锛�2=鍑忎繚宸插彇娑�") +// @ExcelColumn(name="褰撳墠璐圭敤") + private Integer changeStatus; + + @ApiModelProperty(value = "淇濆崟鍙�") @TableField(exist = false) private String applyCode; @@ -111,6 +130,10 @@ @ExcelColumn(name="淇濋櫓鏂规",index =2,width = 10) private String solutionName; + @ApiModelProperty(value = "鏂规绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚") + @TableField(exist = false) + private Integer solutionType; + @ApiModelProperty(value = "鏂规涓婚敭") @TableField(exist = false) private Integer solutionId; @@ -118,6 +141,19 @@ @ApiModelProperty(value = "鎵瑰崟鍙�") @TableField(exist = false) private String validCode; + + @ApiModelProperty(value = "淇濋殰鐘舵�侊細-1=鐢宠涓紱0=淇濋殰涓紱1=涓嶅湪淇濓紱2=鏈敓鏁�") + @TableField(exist = false) + private Integer applyStatus; + + @ApiModelProperty(value = "鏄惁鏄鍑猴紱0=鍚︼紱1=鏄�",hidden = true) + @TableField(exist = false) + private Integer isExcel; + + + @ApiModelProperty(value = "淇濆崟鐘舵��") + @TableField(exist = false) + private Integer status; @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О") @TableField(exist = false) @@ -133,4 +169,39 @@ @TableField(exist = false) private String workTypeName; + @ApiModelProperty(value = "浼佷笟鍚嶇О") + @TableField(exist = false) + private String companyName; + + @ApiModelProperty(value = "淇濆崟鏄庣粏琛屾湇鍔¤垂") + @TableField(exist = false) + private BigDecimal detailServerCost; + + @ApiModelProperty(value = "琛屼繚闄╃敓鏁堟鏈�") + @TableField(exist = false) + private Date parentEndTime; + + @ApiModelProperty(value = "琛屼繚闄╃敓鏁堣捣鏈�") + @TableField(exist = false) + private Date parentStartTime; + + @ApiModelProperty(value = "鏂规鍩虹鐗堟湰涓婚敭", example = "1") + @TableField(exist = false) + private Integer solutionBaseId; + + + @ApiModelProperty(value = "鎵�灞炰繚闄╁叕鍙哥紪鐮侊紙insurance锛�", example = "1") + @TableField(exist = false) + private Integer insuranceId; + + @ApiModelProperty(value = "骞撮緞", example = "1") + @TableField(exist = false) + private Long age; + + @TableField(exist = false) + private String dataFirst; + + @TableField(exist = false) + private String dataSecond; + } -- Gitblit v1.9.3