From 41b5c29f4d3653402b99af7e370bd345e961efdd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 12 十一月 2024 09:27:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
index f4d58da..872e112 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
@@ -1,5 +1,6 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -84,5 +85,11 @@
     @ApiModelProperty(value = "鐗╂枡杞崲鐜�")
     @ExcelColumn(name="鐗╂枡杞崲鐜�")
     private String rate;
+    @ApiModelProperty(value = "涓婇攣鏃堕棿")
+    @ExcelColumn(name="涓婇攣鏃堕棿")
+    private String lockDate;
 
+    @ApiModelProperty(value = "鏈堝垎缁勫悕绉�" ,hidden = true)
+    @TableField(exist = false)
+    private String groupName ;
 }

--
Gitblit v1.9.3