From 2d528d024b179b6b06d1d2702e72f6caa5f67149 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 09:45:30 +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/Solutions.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 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 4deeefd..f9f9f57 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
@@ -77,6 +77,9 @@
@ApiModelProperty(value = "绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚", example = "1")
@ExcelColumn(name="绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
private Integer type;
+ @ApiModelProperty(value = "濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany)", example = "1")
+ @ExcelColumn(name="濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany)")
+ private Integer shopId;
@ApiModelProperty(value = "鏈�浣庡勾榫�", example = "1")
@ExcelColumn(name="鏈�浣庡勾榫�")
@@ -86,11 +89,11 @@
@ExcelColumn(name="鏈�楂樺勾榫�")
private Integer maxAge;
- @ApiModelProperty(value = "淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
+ @ApiModelProperty(value = "淇濋櫓璐圭敤锛堜汉锛� -- 淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
@ExcelColumn(name="淇濋櫓璐圭敤(浜�/澶╋級")
private BigDecimal price;
- @ApiModelProperty(value = "淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
+ @ApiModelProperty(value = " 鍛ㄦ湡鍗曚綅 0澶� 2鏈� 3瀛ｅ害 4鍗婂勾 5骞� -- 淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
@ExcelColumn(name="淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�")
private Integer timeUnit;
@@ -98,13 +101,33 @@
@ExcelColumn(name="鎶曚繚鍛ㄦ湡")
private Integer insureCycle;
- @ApiModelProperty(value = "鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
+ @ApiModelProperty(value = "鎵规敼璁¤垂鍗曚綅 0澶� 1鍗婃湀 2鏈� 3瀛ｅ害 4鍗婂勾 5骞� -- 鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
@ExcelColumn(name="鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�")
private Integer insureCycleUnit;
+
+ @ApiModelProperty(value = "鏄惁鍙姞淇� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍙姞淇� 0鍚� 1鏄�")
+ private Integer canAdd;
+
+ @ApiModelProperty(value = "鏄惁鍙噺淇� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍙噺淇� 0鍚� 1鏄�")
+ private Integer canReduce;
+ @ApiModelProperty(value = "鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�")
+ private Integer delOnlyReplace;
+ @ApiModelProperty(value = "鏄惁鍙淳閬ｅ崟浣� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍙洿鎹㈡淳閬ｅ崟浣� 0鍚� 1鏄�")
+ private Integer canChangeUnit;
@ApiModelProperty(value = "鏈�灏忚璐瑰懆鏈熸椂闂村崟浣� 0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
@ExcelColumn(name="鏈�灏忚璐瑰懆鏈熸椂闂村崟浣� 0澶� 1鍗婃湀 2鏈� 3骞�")
private Integer priceCycleUnit;
+ @ApiModelProperty(value = "鎵瑰鐢熸晥澶╂暟", example = "1")
+ @ExcelColumn(name="鎵瑰鐢熸晥澶╂暟")
+ private Integer addValidDays;
+ @ApiModelProperty(value = "鎵瑰噺鐢熸晥澶╂暟", example = "1")
+ @ExcelColumn(name="鎵瑰噺鐢熸晥澶╂暟")
+ private Integer delValidDays;
@ApiModelProperty(value = "鏄惁鍗曠嫭鎸囨淳宸ョ 0鍚� 1鍥�", example = "1")
@ExcelColumn(name="鏄惁鍗曠嫭鎸囨淳宸ョ 0鍚� 1鍥�")
@@ -113,6 +136,7 @@
@ApiModelProperty(value = "鎺ユ敹鏂囦欢閭")
@ExcelColumn(name="鎺ユ敹鏂囦欢閭")
private String email;
+
@ApiModelProperty(value = "鎵垮寘鍏徃")
@ExcelColumn(name="鎵垮寘鍏徃")
private String companyName;
@@ -132,9 +156,6 @@
@ExcelColumn(name="绛剧珷鍏抽敭瀛楋紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
private String signKeyword;
- @ApiModelProperty(value = "鎵�灞炴柟妗堝熀琛ㄧ紪鐮�(solution_base_id)", example = "1")
- @ExcelColumn(name="鎵�灞炴柟妗堝熀琛ㄧ紪鐮�(solution_base_id)")
- private Integer solutionBaseId;
@ApiModelProperty(value = "鐗堟湰鍙�")
@ExcelColumn(name="鐗堟湰鍙�")
@@ -148,6 +169,10 @@
@ExcelColumn(name="鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�")
private Integer baseId;
+ @ApiModelProperty(value = "寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�", example = "1")
+ @ExcelColumn(name="寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�")
+ private Integer validTypeNum;
+
@ApiModelProperty(value = "鍛樺伐", example = "1")
@TableField(exist = false)
private Integer memberId;
@@ -155,12 +180,9 @@
@TableField(exist = false)
private String insuranceName;
-
@ApiModelProperty(value = "淇濆崟涓婚敭", example = "1")
@TableField(exist = false)
private Integer applyId;
-
-
@ApiModelProperty(value = "宸ョ缂栫爜闆嗗悎", example = "1")
@TableField(exist = false)
@@ -169,5 +191,14 @@
@TableField(exist = false)
private List<SolutionWorktype> worktypeList;
+ @ApiModelProperty(value = "鎬诲懆鏈熻垂鐢�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal cyclePrice;
+ @ApiModelProperty(value = "濮旀墭鍟嗘埛鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String shopName;
+ @ApiModelProperty(value = "鏂规纭涔﹀璞�", example = "1")
+ @TableField(exist = false)
+ private Multifile fanganFile;
}
--
Gitblit v1.9.3