From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java
index 3eaa69c..94aa98e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.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;
@@ -78,6 +79,13 @@
@ApiModelProperty(value = "鍏宠仈鍒嗙被鍚嶇О")
@ExcelColumn(name="鍏宠仈鍒嗙被鍚嶇О")
private String categoryName;
+ @ApiModelProperty(value = "鍏宠仈鐖剁骇鍒嗙被缂栫爜锛堝叧鑱攃ategory)", example = "1")
+ @ExcelColumn(name="鍏宠仈鐖剁骇鍒嗙被缂栫爜锛堝叧鑱攃ategory)")
+ private Integer categoryParentId;
+
+ @ApiModelProperty(value = "鍏宠仈鍒嗙被鍚嶇О")
+ @ExcelColumn(name="鍏宠仈鍒嗙被鍚嶇О")
+ private String categoryParentName;
@ApiModelProperty(value = "涓氬姟绫诲瀷 涓氬姟绫诲瀷 0=璁垮杞﹁締-璁垮杞﹁締 ;" +
"1=wms鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締 ;" +
@@ -88,8 +96,8 @@
@ExcelColumn(name="杞﹁締涓氬姟绫诲瀷")
private Integer carBizType;
- @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0璁垮 1鍐呴儴浜哄憳 2鐩稿叧鏂逛汉鍛� 3璐ц繍鍙告満", example = "1")
- @ExcelColumn(name="鐢ㄦ埛绫诲瀷 0璁垮 1鍐呴儴浜哄憳 2鐩稿叧鏂逛汉鍛� 3璐ц繍鍙告満")
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅 4鐩稿叧鏂逛汉鍛� 5璐ц繍鍙告満 ", example = "1")
+ @ExcelColumn(name="鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅 4鐩稿叧鏂逛汉鍛� 5璐ц繍鍙告満 ")
private Integer memberType;
@ApiModelProperty(value = "浜哄憳鍚嶇О")
@@ -112,7 +120,10 @@
@ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0杞﹁締 1浜哄憳 2璁垮鐢宠璁板綍 3璁垮鎶ュ鐢宠璁板綍 4鏈堝彴浣滀笟璁板綍", example = "1")
@ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0杞﹁締 1浜哄憳 2璁垮鐢宠璁板綍 3璁垮鎶ュ鐢宠璁板綍 4鏈堝彴浣滀笟璁板綍")
private Integer objType;
-
+ @ApiModelProperty(value = "缁熻鏃ユ湡锛�2024-10-12 00:00:00锛�")
+ @ExcelColumn(name="缁熻鏃ユ湡锛�2024-10-12 00:00:00锛�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date timeInfo;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜", example = "1")
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
private Integer objId;
@@ -125,4 +136,16 @@
@ExcelColumn(name="杩涘嚭璁惧鍚嶇О")
private String deviceName;
+ @ApiModelProperty(value = "浜鸿劯鐓х墖")
+ @TableField(exist = false)
+ private String faceImg;
+ @ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
+ @TableField(exist = false)
+ private String idcardNo;
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @TableField(exist = false)
+ private String idcardDecode;
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @TableField(exist = false)
+ private String memberCode;
}
--
Gitblit v1.9.3