From a7fb50c91e4932aa175be266fbdd42b2a70eba66 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 22 五月 2024 18:11:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java index 0d25cc0..d3e8ec1 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java @@ -92,9 +92,13 @@ @ExcelColumn(name="鏄惁缁堝 0鍚� 1鏄�") private Integer isEndCheck; - @ApiModelProperty(value = "璁垮鐢宠璁板綍缂栫爜(鍏宠仈visit锛�", example = "1") - @ExcelColumn(name="璁垮鐢宠璁板綍缂栫爜(鍏宠仈visit锛�") - private Integer visitId; + @ApiModelProperty(value = "鍏宠仈涓氬姟涓婚敭", example = "1") + @ExcelColumn(name="鍏宠仈涓氬姟涓婚敭") + private Integer objId; + + @ApiModelProperty(value = "鍏宠仈涓氬姟绫诲瀷锛�0=璁垮鐢宠锛�1=鐢ㄨ溅鐢宠", example = "1") + @ExcelColumn(name="鍏宠仈涓氬姟绫诲瀷锛�0=璁垮鐢宠锛�1=鐢ㄨ溅鐢宠") + private Integer objType; @ApiModelProperty(value = "瀹℃壒绛夌骇", example = "1") @ExcelColumn(name="瀹℃壒绛夌骇") -- Gitblit v1.9.3