From 9cf8c1d147e558c9a89b4ef14e79ea79902a7d9d Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期六, 12 十月 2024 18:25:16 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java index 70323e1..04e55fb 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java @@ -83,7 +83,6 @@ @ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О") @ExcelColumn(name="杩涘巶闂ㄧ" ,index = 6,width = 12) - @TableField(exist = false) private String deviceName; @ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜") @@ -96,6 +95,8 @@ @ApiModelProperty(value = "璁垮ID(鍏宠仈member)") private Integer memberId; + @ApiModelProperty(value = "璁垮1闂ㄧ浜嬩欢2杞﹁締浜嬩欢") + private String accessType; @ApiModelProperty(value = "浜嬩欢绫诲瀷鐮�") private String eventCode; @@ -116,6 +117,10 @@ @TableField(exist = false) private String keyWords; + @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐") + @TableField(exist = false) + private Integer companyType; + @ApiModelProperty(value = "寮�濮嬫椂闂�") @TableField(exist = false) private Date startTime; -- Gitblit v1.9.3