From d46715cef48f0d343b5ac303be6fdeb62a50042a Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期二, 16 四月 2024 14:54:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.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/entity/DryOrder.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
index 65cf82c..33cd2e2 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
@@ -156,5 +156,5 @@
/**鐢佃兘娑堣��*/
@ApiModelProperty(value = "鐢佃兘娑堣��")
- private Double electric;
+ private Double watt;
}
--
Gitblit v1.9.3