From 4248fbfb4f6a43cbb4884523f599d7719d1ba1c6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 13:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java | 2 +-
1 files changed, 1 insertions(+), 1 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 be66e68..5caac5f 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
@@ -81,7 +81,7 @@
"4=wms瀹夋嘲鍏姟杞︼細鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;" +
"5=wms瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締;" +
"6=鏈煡杞﹁締; ", example = "1")
- @ExcelColumn(name="杞﹁締涓氬姟绫诲瀷",index = 5,width = 16,valueMapping = "0=璁垮杞﹁締-璁垮杞﹁締;1=璐ц繍杞﹁締-澶栧崗杩愯緭杞﹁締;2=璐ц繍杞﹁締-甯傚叕鍙稿嵏璐ц溅杈�;3=璐ц繍杞﹁締-鍔犲伐鐑熷嵏璐ц溅杈�;4=鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;5=璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締;6=鏈煡杞﹁締;")
+// @ExcelColumn(name="杞﹁締涓氬姟绫诲瀷",index = 5,width = 16,valueMapping = "0=璁垮杞﹁締-璁垮杞﹁締;1=璐ц繍杞﹁締-澶栧崗杩愯緭杞﹁締;2=璐ц繍杞﹁締-甯傚叕鍙稿嵏璐ц溅杈�;3=璐ц繍杞﹁締-鍔犲伐鐑熷嵏璐ц溅杈�;4=鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;5=璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締;6=鏈煡杞﹁締;")
private Integer carBizType;
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅 4鐩稿叧鏂逛汉鍛� 5璐ц繍鍙告満 ", example = "1")
--
Gitblit v1.9.3