From bb32acfe7b46f4353007233755dd417fce7f952e Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期二, 12 三月 2024 11:57:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/service/src/main/java/com/doumee/dao/business/model/Insurance.java | 3 +++ 1 files changed, 3 insertions(+), 0 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..38d50cc 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,6 +76,9 @@ @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; -- Gitblit v1.9.3