From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
index 001d95d..9e1ea6d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
@@ -1,15 +1,17 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
+import java.util.List;
/**
* 瀹℃壒妯＄増閰嶇疆淇℃伅琛�
@@ -32,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,15 +42,14 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
- @ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ @ApiModelProperty(value = "鑺傜偣鍚嶇О")
+ @ExcelColumn(name="鑺傜偣鍚嶇О")
private String remark;
@ApiModelProperty(value = "绫诲瀷 0瀹℃壒 1鎶勯��", example = "1")
@@ -85,24 +85,17 @@
@ExcelColumn(name="瀹℃壒涓荤绛夌骇 0鐩存帴涓荤 1浜岀骇涓荤 2涓夌骇涓荤 4鍥涚骇涓荤")
private Integer objLevel;
- @ApiModelProperty(value = "澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱", example = "1")
- @ExcelColumn(name="澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱")
+ @ApiModelProperty(value = "澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱 2鍗曚汉瀹℃壒", example = "1")
+ @ExcelColumn(name="澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱 2鍗曚汉瀹℃壒")
private Integer approveType;
@ApiModelProperty(value = "鏃犱富绠￠�夐」 0娴佺▼缁撴潫 1鐢变笂绾т富绠′唬鏇垮鏍�", example = "1")
@ExcelColumn(name="鏃犱富绠￠�夐」 0娴佺▼缁撴潫 1鐢变笂绾т富绠′唬鏇垮鏍�")
private Integer noleaderOpt;
- @ApiModelProperty(value = "妯＄増缂栫爜锛堝叧鑱攁pprove_templ)", example = "1")
- @ExcelColumn(name="妯＄増缂栫爜锛堝叧鑱攁pprove_templ)")
- private Integer templId;
- @ApiModelProperty(value = "鏄惁鎸囧畾鍙告満椤� 0涓嶆寚瀹� 1鎸囧畾", example = "1")
- @ExcelColumn(name="鏄惁鎸囧畾鍙告満椤� 0涓嶆寚瀹� 1鎸囧畾")
- private Integer driverParam;
+ @ApiModelProperty(value = "瀹℃壒浜哄垪琛�")
+ @TableField(exist = false)
+ private List<Member> memberList;
-
- @ApiModelProperty(value = "鏄惁淇敼鐩殑鍦� 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁淇敼鐩殑鍦� 0鍚� 1鏄�")
- private Integer addrParam;
}
--
Gitblit v1.9.3