From c51de64d5ee334d914c90f5e4f82a13f159492ca Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 四月 2026 20:08:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java b/server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java
index ae40e38..56b25a1 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java
@@ -10,6 +10,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 璁㈠崟鎿嶄綔鏃ュ織
@@ -69,10 +70,15 @@
@ApiModelProperty(value = "鎿嶄綔鍚庢暟鎹�")
private String afterInfo;
- @ApiModelProperty(value = "璁㈠崟鐘舵��:0=寰呮帴鍗�;1=宸叉帴鍗�;2=杩涜涓�;3=宸插畬鎴�;99=宸插彇娑�;", example = "0")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��:灏卞湴瀵勫瓨鐘舵�侊細0=寰呮敮浠�;1=寰呭瘎瀛�;2=宸插瘎瀛�;3=寰呭彇浠�;6=瀛樺湪閫炬湡;7=宸插畬鎴�;96:璁㈠崟鍏抽棴锛堥��娆撅級;97:鍙栨秷閫炬湡;98=鍙栨秷涓�;99=宸插彇娑�; " +
+ " 寮傚湴瀵勫瓨鐘舵�侊細0=寰呮敮浠�;1=寰呭瘎瀛�;2=宸插瘎瀛�;3=宸叉帴鍗�;4=娲鹃�佷腑;5=宸插埌搴�/宸查�佽揪;6=瀛樺湪閫炬湡;7=宸插畬鎴�;96:璁㈠崟鍏抽棴锛堥��娆撅級;97:鍙栨秷閫炬湡;98=鍙栨秷涓�;99=宸插彇娑�;", example = "0")
private Integer orderStatus;
@ApiModelProperty(value = "鎿嶄綔浜虹被鍨嬶細0=鐢ㄦ埛锛�1=鍙告満锛�2=闂ㄥ簵锛�3=绯荤粺绠＄悊鍛�", example = "0")
private Integer optUserType;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷锛堝閫夋煡璇級")
+ private List<Integer> objTypeList;
+
}
--
Gitblit v1.9.3