From 58b6edb6af3c36b4d7e7e812e8f93fe04d8e48e5 Mon Sep 17 00:00:00 2001
From: FLYPHT <1035748121@qq.com>
Date: Sun, 24 Jul 2022 18:56:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8Fexpr=E5=AD=97=E6=AE=B5=20=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAdependExpr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java | 2 +-
 .../cc/smtweb/system/bpm/web/design/form/define/BaseDatasetField.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
index 1168e0d..333fef1 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
@@ -230,7 +230,7 @@ public class ModelFormHelper {
             field.put("linkDb", pdf.linkDb);
             field.put("linkField", pdf.linkField);
             field.put("value", pdf.value);
-            field.put("expr", pdf.expr);
+            field.put("dependExpr", pdf.dependExpr);
             field.put("defValue", pdf.defValue);
             if (!isField) {
                 PageDatasetFilter filter = (PageDatasetFilter) pdf;
diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/BaseDatasetField.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/BaseDatasetField.java
index 6f8d136..1ea9e19 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/BaseDatasetField.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/BaseDatasetField.java
@@ -41,7 +41,7 @@ public class BaseDatasetField {
     // 默认值
     public String defValue;
     // type为depend时, 表达式
-    public String expr;
+    public String dependExpr;
     @JsonIgnore
     public boolean isFieldNotNull() {
         return notNull == 1;