From deb4575b72443cf906946a9fb28a557c16556fb9 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 01 十一月 2024 09:30:50 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/Insurance.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Insurance.java b/server/service/src/main/java/com/doumee/dao/business/model/Insurance.java
index fa99d57..31df4eb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Insurance.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Insurance.java
@@ -76,8 +76,28 @@
@ApiModelProperty(value = "鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�", example = "1")
@ExcelColumn(name="鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�")
private Integer baseId;
+ @ApiModelProperty(value = "濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
+ @ExcelColumn(name="濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany锛�")
+ private Integer shopId;
@ApiModelProperty(value = "宸ョ闆嗗悎", example = "1")
@TableField(exist = false)
private List<Worktype> worktypeList;
-
+ @ApiModelProperty(value = "LOGO鍥炬爣", example = "1")
+ @ExcelColumn(name="LOGO鍥炬爣")
+ private String logo;
+ @ApiModelProperty(value = "鑻辨枃鍚嶇О", example = "1")
+ @ExcelColumn(name="鑻辨枃鍚嶇О")
+ private String englishName;
+ @ApiModelProperty(value = "鑱旂郴浜�", example = "1")
+ @ExcelColumn(name="鑱旂郴浜�")
+ private String linkName;
+ @ApiModelProperty(value = "鑱旂郴浜虹數璇�", example = "1")
+ @ExcelColumn(name="鑱旂郴浜虹數璇�")
+ private String linkPhone;
+ @ApiModelProperty(value = "淇濋櫓鏀跨瓥", example = "1")
+ @ExcelColumn(name="淇濋櫓鏀跨瓥")
+ private String policy;
+ @ApiModelProperty(value = "淇濋櫓鏉℃", example = "1")
+ @ExcelColumn(name="淇濋櫓鏉℃")
+ private String agreement;
}
--
Gitblit v1.9.3