From ccbcb9487250f063dc7c4e72cfa18228dca8dac8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 六月 2025 12:05:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java
index da9e9ab..7a3196d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java
@@ -1,13 +1,15 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+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.math.BigDecimal;
@@ -19,7 +21,7 @@
@Data
@ApiModel("鏈堝彴_鍏ュ洯鍘熷洜淇℃伅琛�")
@TableName("`platform_reason`")
-public class PlatformReason {
+public class PlatformReason extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -47,6 +49,9 @@
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
+ @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤", example = "1")
+ @ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤")
+ private Integer status;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
@@ -71,5 +76,11 @@
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+ @ApiModelProperty(value = "瀹℃壒妯＄増缂栫爜(鍏宠仈approve_templ)", example = "1")
+ @ExcelColumn(name="瀹℃壒妯＄増缂栫爜(鍏宠仈approve_templ)")
+ private Integer approveTemplId;
+ @ApiModelProperty(value = "鍒嗙粍鍚�", example = "1")
+ @TableField(exist = false)
+ private String groupName;
}
--
Gitblit v1.9.3