From 17480b5b82744f4c74b61a2f1e4e5ea780ccc3ff Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 27 十一月 2024 13:45:25 +0800
Subject: [PATCH] 修复冲突
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
index b7d2b23..7ceb381 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
@@ -163,7 +163,7 @@
private String warning;
/**鐘舵��**/
- private Map<String, Object> eqp_state;
+// private Map<String, Object> eqp_state;
/**璁惧鐘舵��**/
private String eqp_status;
--
Gitblit v1.9.3