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 37c6e8ac..fdc0d2e2 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
@@ -4,6 +4,8 @@ package com.jero.generater.modules.online.cgform.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import org.jetbrains.annotations.Nullable;
+
 import java.io.Serializable;
 
 @TableName("onl_cgform_button")
@@ -24,9 +26,6 @@ public class OnlCgformButton implements Serializable {
     private String buttonIcon;
     private String optPosition;
 
-    public OnlCgformButton() {
-    }
-
     public String getId() {
         return this.id;
     }
@@ -125,141 +124,166 @@ public class OnlCgformButton implements Serializable {
             if (!var2.canEqual(this)) {
                 return false;
             } else {
-                label143: {
-                    Integer var3 = this.getOrderNum();
-                    Integer var4 = var2.getOrderNum();
-                    if (var3 == null) {
-                        if (var4 == null) {
-                            break label143;
-                        }
-                    } else if (var3.equals(var4)) {
-                        break label143;
-                    }
-
-                    return false;
-                }
-
-                String var5 = this.getId();
-                String var6 = var2.getId();
-                if (var5 == null) {
-                    if (var6 != null) {
-                        return false;
-                    }
-                } else if (!var5.equals(var6)) {
-                    return false;
-                }
-
-                String var7 = this.getCgformHeadId();
-                String var8 = var2.getCgformHeadId();
-                if (var7 == null) {
-                    if (var8 != null) {
-                        return false;
-                    }
-                } else if (!var7.equals(var8)) {
-                    return false;
-                }
-
-                label122: {
-                    String var9 = this.getButtonCode();
-                    String var10 = var2.getButtonCode();
-                    if (var9 == null) {
-                        if (var10 == null) {
-                            break label122;
-                        }
-                    } else if (var9.equals(var10)) {
-                        break label122;
-                    }
-
-                    return false;
-                }
-
-                label115: {
-                    String var11 = this.getButtonName();
-                    String var12 = var2.getButtonName();
-                    if (var11 == null) {
-                        if (var12 == null) {
-                            break label115;
-                        }
-                    } else if (var11.equals(var12)) {
-                        break label115;
-                    }
-
-                    return false;
-                }
-
-                String var13 = this.getButtonStyle();
-                String var14 = var2.getButtonStyle();
-                if (var13 == null) {
-                    if (var14 != null) {
-                        return false;
-                    }
-                } else if (!var13.equals(var14)) {
-                    return false;
-                }
-
-                String var15 = this.getOptType();
-                String var16 = var2.getOptType();
-                if (var15 == null) {
-                    if (var16 != null) {
-                        return false;
-                    }
-                } else if (!var15.equals(var16)) {
-                    return false;
-                }
-
-                label94: {
-                    String var17 = this.getExp();
-                    String var18 = var2.getExp();
-                    if (var17 == null) {
-                        if (var18 == null) {
-                            break label94;
-                        }
-                    } else if (var17.equals(var18)) {
-                        break label94;
-                    }
-
-                    return false;
-                }
-
-                label87: {
-                    String var19 = this.getButtonStatus();
-                    String var20 = var2.getButtonStatus();
-                    if (var19 == null) {
-                        if (var20 == null) {
-                            break label87;
-                        }
-                    } else if (var19.equals(var20)) {
-                        break label87;
-                    }
-
-                    return false;
-                }
-
-                String var21 = this.getButtonIcon();
-                String var22 = var2.getButtonIcon();
-                if (var21 == null) {
-                    if (var22 != null) {
-                        return false;
-                    }
-                } else if (!var21.equals(var22)) {
-                    return false;
-                }
-
-                String var23 = this.getOptPosition();
-                String var24 = var2.getOptPosition();
-                if (var23 == null) {
-                    if (var24 != null) {
-                        return false;
-                    }
-                } else if (!var23.equals(var24)) {
-                    return false;
-                }
-
-                return true;
+                return !getBooleanReturn(var2);
             }
         }
     }
 
+    private boolean getBooleanReturn(OnlCgformButton var2) {
+        Boolean x = getBoolean143(var2);
+        if (x != null) {
+            return x;
+        }
+
+        if (getReturn(this.getId(), var2.getId())) {
+            return true;
+        }
+
+        if (getReturn(this.getCgformHeadId(), var2.getCgformHeadId())) {
+            return true;
+        }
+
+        Boolean x1 = getBoolean122(var2);
+        if (x1 != null) {
+            return x1;
+        }
+
+        Boolean x2 = getBoolean115(var2);
+        if (x2 != null) {
+            return x2;
+        }
+
+        if (getReturn(this.getButtonStyle(), var2.getButtonStyle())) {
+            return true;
+        }
+
+        if (getReturn(this.getOptType(), var2.getOptType())) {
+            return true;
+        }
+
+        Boolean x3 = getBoolean94(var2);
+        if (x3 != null) {
+            return x3;
+        }
+
+        Boolean x4 = getBoolean87(var2);
+        if (x4 != null) {
+            return x4;
+        }
+
+        if (getReturn(this.getButtonIcon(), var2.getButtonIcon())) {
+            return true;
+        }
+
+        if (getReturn(this.getOptPosition(), var2.getOptPosition())) {
+            return true;
+        }
+        return false;
+    }
+
+    private boolean getReturn(String id, String id2) {
+        String var5 = id;
+        String var6 = id2;
+        if (var5 == null) {
+            if (var6 != null) {
+                return true;
+            }
+        } else if (!var5.equals(var6)) {
+            return true;
+        }
+        return false;
+    }
+
+    @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;
+            }
+
+            return true;
+        }
+        return null;
+    }
+
+    @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;
+            }
+
+            return true;
+        }
+        return null;
+    }
+
+    @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;
+            }
+
+            return true;
+        }
+        return null;
+    }
+
+    @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;
+            }
+
+            return true;
+        }
+        return null;
+    }
+
+    @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;
+            }
+
+            return true;
+        }
+        return null;
+    }
+
     protected boolean canEqual(Object other) {
         return other instanceof OnlCgformButton;
     }