Merge branch 'master' of http://8.130.72.63:18081/single-window/yqyc-system

snowy-plugin/snowy-plugin-gen/src/main/resources/backend/Controller.java.btl

@@ -29,11 +29,12 @@ import ${packageName}.${moduleName}.modular.${busName}.param.${className}EditPar
 import ${packageName}.${moduleName}.modular.${busName}.param.${className}IdParam;
 import ${packageName}.${moduleName}.modular.${busName}.param.${className}PageParam;
 import ${packageName}.${moduleName}.modular.${busName}.service.${className}Service;
-
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
+import java.io.IOException;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import java.net.URLEncoder;
@@ -106,10 +107,10 @@ public class ${className}Controller {
     @CommonLog("导出${functionName}")
     @SaCheckPermission("/${moduleName}/${busName}/export")
     @PostMapping("/${moduleName}/${busName}/export")
-    public void export(@RequestBody @Valid ${className}PageParam ${classNameFirstLower}PageParam,, HttpServletResponse response) {
+    public void export(@RequestBody @Valid ${className}PageParam ${classNameFirstLower}PageParam, HttpServletResponse response) {
         Page<${className}> page =  ${classNameFirstLower}Service.page(${classNameFirstLower}PageParam);
         List<${className}> records = page.getRecords();
-        exportExcel(response,${className}.class,records,${functionName});
+        exportExcel(response,${className}.class,records,"${functionName}");
     }
 
 

snowy-plugin/snowy-plugin-gen/src/main/resources/backend/Entity.java.btl

@@ -38,7 +38,7 @@ public class ${className} {
     <% } else { %><% } %>
     @Schema(description = "${configList[i].fieldRemark}")
     @ColumnWidth(12)
-    @ExcelProperty(index = i,value = "${configList[i].fieldRemark}")
+    @ExcelProperty(index = ${i},value = "${configList[i].fieldRemark}")
     <% if(configList[i].needAutoInsert) { %>
     @TableField(fill = FieldFill.INSERT)
     <% } else { %><% } %>