Merge remote-tracking branch 'origin/dev' into feature/springdoc

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm

@@ -4,6 +4,7 @@ import lombok.*;
 #foreach ($column in $columns)
 #if (${column.javaType} == "LocalDateTime")
 import java.time.LocalDateTime;
+#break
 #end
 #end
 import io.swagger.annotations.*;

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm

@@ -34,9 +34,9 @@ const crudSchemas = reactive<VxeCrudSchema>({
       #if ("" != $dictType)## 有数据字典
       dictType: DICT_TYPE.$dictType.toUpperCase(),
       #if (${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
-      dictData: 'number',
+      dictClass: 'number',
       #else
-      dictData: 'string',
+      dictClass: 'string',
       #end
       #end
       #if (!$column.createOperation && !$column.updateOperation)
@@ -78,10 +78,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
       },
       #elseif($column.htmlType == "imageUpload")## 图片上传
       form: {
-        component: 'UploadImg',
-        componentProps: {
-          limit: 1
-        }
+        component: 'UploadImg' // 单图上传，多图为UploadImgs
       },
       #elseif($column.htmlType == "fileUpload")## 图片上传
       form: {