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 |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 f98b4fb..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
@@ -79,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鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締 ;" +

--
Gitblit v1.9.3