diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformButton.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformButton.java
index fdc0d2e2..aca6e71b 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformButton.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformButton.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 @TableName("onl_cgform_button")
 public class OnlCgformButton implements Serializable {
@@ -175,10 +176,7 @@ public class OnlCgformButton implements Serializable {
             return true;
         }
 
-        if (getReturn(this.getOptPosition(), var2.getOptPosition())) {
-            return true;
-        }
-        return false;
+        return getReturn(this.getOptPosition(), var2.getOptPosition());
     }
 
     private boolean getReturn(String id, String id2) {
@@ -196,17 +194,13 @@ public class OnlCgformButton implements Serializable {
 
     @Nullable
     private Boolean getBoolean87(OnlCgformButton var2) {
-        label87: {
-            String var19 = this.getButtonStatus();
-            String var20 = var2.getButtonStatus();
-            if (var19 == null) {
-                if (var20 == null) {
-                    break label87;
-                }
-            } else if (var19.equals(var20)) {
-                break label87;
+        String var19 = this.getButtonStatus();
+        String var20 = var2.getButtonStatus();
+        if (var19 == null) {
+            if (var20 != null) {
+                return true;
             }
-
+        } else if (!Objects.equals(var19,var20)) {
             return true;
         }
         return null;
@@ -214,17 +208,13 @@ public class OnlCgformButton implements Serializable {
 
     @Nullable
     private Boolean getBoolean94(OnlCgformButton var2) {
-        label94: {
-            String var17 = this.getExp();
-            String var18 = var2.getExp();
-            if (var17 == null) {
-                if (var18 == null) {
-                    break label94;
-                }
-            } else if (var17.equals(var18)) {
-                break label94;
+        String var17 = this.getExp();
+        String var18 = var2.getExp();
+        if (var17 == null) {
+            if (var18 != null) {
+                return true;
             }
-
+        } else if (!Objects.equals(var17,var18)) {
             return true;
         }
         return null;
@@ -232,17 +222,13 @@ public class OnlCgformButton implements Serializable {
 
     @Nullable
     private Boolean getBoolean115(OnlCgformButton var2) {
-        label115: {
-            String var11 = this.getButtonName();
-            String var12 = var2.getButtonName();
-            if (var11 == null) {
-                if (var12 == null) {
-                    break label115;
-                }
-            } else if (var11.equals(var12)) {
-                break label115;
+        String var11 = this.getButtonName();
+        String var12 = var2.getButtonName();
+        if (var11 == null) {
+            if (var12 != null) {
+                return true;
             }
-
+        } else if (!Objects.equals(var11,var12)) {
             return true;
         }
         return null;
@@ -250,17 +236,13 @@ public class OnlCgformButton implements Serializable {
 
     @Nullable
     private Boolean getBoolean122(OnlCgformButton var2) {
-        label122: {
-            String var9 = this.getButtonCode();
-            String var10 = var2.getButtonCode();
-            if (var9 == null) {
-                if (var10 == null) {
-                    break label122;
-                }
-            } else if (var9.equals(var10)) {
-                break label122;
+        String var9 = this.getButtonCode();
+        String var10 = var2.getButtonCode();
+        if (var9 == null) {
+            if (var10 != null) {
+                return true;
             }
-
+        } else if (!Objects.equals(var9,var10)) {
             return true;
         }
         return null;
@@ -268,17 +250,13 @@ public class OnlCgformButton implements Serializable {
 
     @Nullable
     private Boolean getBoolean143(OnlCgformButton var2) {
-        label143: {
-            Integer var3 = this.getOrderNum();
-            Integer var4 = var2.getOrderNum();
-            if (var3 == null) {
-                if (var4 == null) {
-                    break label143;
-                }
-            } else if (var3.equals(var4)) {
-                break label143;
+        Integer var3 = this.getOrderNum();
+        Integer var4 = var2.getOrderNum();
+        if (var3 == null) {
+            if (var4 != null) {
+                return true;
             }
-
+        } else if (!Objects.equals(var3,var4)) {
             return true;
         }
         return null;
@@ -289,7 +267,6 @@ public class OnlCgformButton implements Serializable {
     }
 
     public int hashCode() {
-        boolean var1 = true;
         byte var2 = 1;
         Integer var3 = this.getOrderNum();
         int var14 = var2 * 59 + (var3 == null ? 43 : var3.hashCode());