From 20ab36d718cf7cae6e2b24b411bc365b4fa79e6e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 21 五月 2024 17:13:22 +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/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 05d9e2e..3ae9442 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