From 51a558d690e6092a9e48801a6f83e50e3d6b7ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Thu, 16 Mar 2023 18:11:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=20=E7=82=B9=E9=80=89=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/java/bo.java.vm              | 10 +++++-----
 .../src/main/resources/vm/java/vo.java.vm              |  2 +-
 .../src/main/resources/vm/vue/index-tree.vue.vm        |  4 ++--
 .../src/main/resources/vm/vue/index.vue.vm             |  4 ++--
 .../src/main/resources/vm/vue/v3/index-tree.vue.vm     |  4 ++--
 .../src/main/resources/vm/vue/v3/index.vue.vm          |  4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
index 653cce17..e4bba017 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
@@ -26,18 +26,18 @@ import java.util.Date;
 public class ${ClassName}Bo extends BaseEntity {
 
 #foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.isInsert || $column.isEdit))
+#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit))
     /**
      * $column.columnComment
      */
-#if($column.isInsert && $column.isEdit)
+#if($column.insert && $column.edit)
 #set($Group="AddGroup.class, EditGroup.class")
-#elseif($column.isInsert)
+#elseif($column.insert)
 #set($Group="AddGroup.class")
-#elseif($column.isEdit)
+#elseif($column.edit)
 #set($Group="EditGroup.class")
 #end
-#if($column.isRequired == 1)
+#if($column.required)
 #if($column.javaType == 'String')
     @NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
 #else
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
index 39280c5c..25b2bad8 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -32,7 +32,7 @@ public class ${ClassName}Vo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-#if($column.isList)
+#if($column.list)
     /**
      * $column.columnComment
      */
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index 28f65f96..2f5380e3 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -334,7 +334,7 @@ export default {
       // 表单校验
       rules: {
 #foreach ($column in $columns)
-#if($column.isInsert || $column.isEdit)
+#if($column.insert || $column.edit)
 #if($column.required)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
@@ -407,7 +407,7 @@ export default {
     reset() {
       this.form = {
 #foreach ($column in $columns)
-#if($column.isInsert || $column.isEdit)
+#if($column.insert || $column.edit)
 #if($column.htmlType == "checkbox")
         $column.javaField: []#if($foreach.count != $columns.size()),#end
 #else
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 644f3894..7eb0212c 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -344,7 +344,7 @@ export default {
       // 表单校验
       rules: {
 #foreach ($column in $columns)
-#if($column.isInsert || $column.isEdit)
+#if($column.insert || $column.edit)
 #if($column.required)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
@@ -398,7 +398,7 @@ export default {
     reset() {
       this.form = {
 #foreach ($column in $columns)
-#if($column.isInsert || $column.isEdit)
+#if($column.insert || $column.edit)
 #if($column.htmlType == "checkbox")
         $column.javaField: []#if($foreach.count != $columns.size()),#end
 #else
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
index dfc55ae9..8f4113e0 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
@@ -305,7 +305,7 @@ const data = reactive({
   },
   rules: {
 #foreach ($column in $columns)
-#if($column.isInsert || $column.isEdit)
+#if($column.insert || $column.edit)
 #if($column.required)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
@@ -368,7 +368,7 @@ function cancel() {
 function reset() {
   form.value = {
 #foreach ($column in $columns)
-#if($column.isInsert || $column.isEdit)
+#if($column.insert || $column.edit)
 #if($column.htmlType == "checkbox")
     $column.javaField: []#if($foreach.count != $columns.size()),#end
 #else
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
index 438332c0..808e3e6f 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
@@ -316,7 +316,7 @@ const data = reactive({
   },
   rules: {
 #foreach ($column in $columns)
-#if($column.isInsert || $column.isEdit)
+#if($column.insert || $column.edit)
 #if($column.required)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
@@ -370,7 +370,7 @@ function cancel() {
 function reset() {
   form.value = {
 #foreach ($column in $columns)
-#if($column.isInsert || $column.isEdit)
+#if($column.insert || $column.edit)
 #if($column.htmlType == "checkbox")
     $column.javaField: []#if($foreach.count != $columns.size()),#end
 #else