feat: fix代码生成类型问题

ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm

@@ -25,11 +25,11 @@ import org.ruoyi.common.core.validate.EditGroup;
 public class ${ClassName}Bo implements Serializable {
 
 #foreach ($column in $columns)
-    #if(!$table.isSuperColumn($column.javaField) && ($column.isPk || $column.query || $column.insert || $column.edit))
+    #if($column.isPk || $column.query || $column.insert || $column.edit|| $column.required)
         /**
          * $column.columnComment
          */
-        #if($column.insert && $column.edit)
+        #if(($column.insert && $column.edit) || $column.required)
             #set($Group="AddGroup.class, EditGroup.class")
         #elseif($column.insert)
             #set($Group="AddGroup.class")

ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -1,22 +1,10 @@
 package ${packageName}.domain;
 
-    #foreach ($column in $columns)
-        #if($column.javaField=='tenantId')
-            #set($IsTenant=1)
-        #end
-    #end
-    #if($IsTenant==1)
-    import core.tenant.common.org.ruoyi.TenantEntity;
-    #else
-    #end
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-    #foreach ($import in $importList)
-    import ${import};
-    #end
-
-import org.ruoyi.core.domain.BaseEntity;
+#foreach ($import in $importList)
+import ${import};
+#end
 
 /**
  * ${functionName}对象 ${tableName}
@@ -24,15 +12,9 @@ import org.ruoyi.core.domain.BaseEntity;
  * @author ${author}
  * @date ${datetime}
  */
-#if($IsTenant==1)
-    #set($Entity="TenantEntity")
-#else
-    #set($Entity="BaseEntity")
-#end
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("${tableName}")
-public class ${ClassName} extends ${Entity} {
+public class ${ClassName} implements Serializable {
 
 
 #foreach ($column in $columns)