Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml

yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm

@@ -316,7 +316,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
         }
         // 插入
 #end
-        ${subClassNameVar}.clean() // 清理掉创建、更新时间等相关属性值
+        ${subClassNameVar}.clean(); // 清理掉创建、更新时间等相关属性值
         ${subClassNameVars.get($index)}Mapper.insert(${subClassNameVar});
         return ${subClassNameVar}.getId();
     }

yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm

@@ -180,7 +180,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 #end
     },
     toolbarConfig: {
-      refresh: { code: 'query' },
+      refresh: true,
       search: true,
     },
   } as VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>,

yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm

@@ -131,7 +131,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     enabled: true,
   },
   toolbarConfig: {
-    refresh: { code: 'query' },
+    refresh: true,
     search: true,
   },
 #else

yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm

@@ -174,7 +174,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 #end
     },
     toolbarConfig: {
-      refresh: { code: 'query' },
+      refresh: true,
       search: true,
     },
   } as VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>,

yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm

@@ -125,7 +125,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     enabled: true,
   },
   toolbarConfig: {
-    refresh: { code: 'query' },
+    refresh: true,
     search: true,
   },
 #else