From 463f4334cf41a30348067f5d5b3cf288c19c0eba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 一月 2024 14:54:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/Solutions.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
index ab008d4..9408a79 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
@@ -128,6 +128,9 @@
@ApiModelProperty(value = "鍏朵粬璇存槑")
@ExcelColumn(name="鍏朵粬璇存槑")
private String ortherInfo;
+ @ApiModelProperty(value = "绛剧珷鍏抽敭瀛楋紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+ @ExcelColumn(name="绛剧珷鍏抽敭瀛楋紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+ private String signKeyword;
@ApiModelProperty(value = "鎵�灞炴柟妗堝熀琛ㄧ紪鐮�(solution_base_id)", example = "1")
@ExcelColumn(name="鎵�灞炴柟妗堝熀琛ㄧ紪鐮�(solution_base_id)")
@@ -136,9 +139,6 @@
@ApiModelProperty(value = "鐗堟湰鍙�")
@ExcelColumn(name="鐗堟湰鍙�")
private String version;
- @ApiModelProperty(value = "绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
- @ExcelColumn(name="绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
- private String signKeyword;
@ApiModelProperty(value = "璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁", example = "1")
@ExcelColumn(name="璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁")
@@ -152,6 +152,13 @@
@TableField(exist = false)
private Integer memberId;
+
+ @ApiModelProperty(value = "淇濆崟涓婚敭", example = "1")
+ @TableField(exist = false)
+ private Integer applyId;
+
+
+
@ApiModelProperty(value = "宸ョ缂栫爜闆嗗悎", example = "1")
@TableField(exist = false)
private List<Integer> worktypeIdList;
--
Gitblit v1.9.3