Skip to content

Commit 02b06d5

Browse files
colorful3juzi214032
authored andcommitted
fix: 修复代码生成器控制器模板的bug
1 parent 7923585 commit 02b06d5

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/test/resources/mpg/templates/controller.java.ftl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import ${superControllerClassPackage};
4040
<#else>
4141
@Controller
4242
</#if>
43-
@RequestMapping("/${package.Controller?split(".")?last}<#if package.ModuleName??>/${package.ModuleName}</#if>/<#if controllerMappingHyphenStyle??>${controllerMappingHyphen?replace("-do", "")}<#else>${table.entityPath?replace("DO", "")}</#if>")
43+
@RequestMapping("/${package.Controller?split(".")?last}<#if package.ModuleName?? && package.ModuleName != "">/${package.ModuleName}</#if>/<#if controllerMappingHyphenStyle??>${controllerMappingHyphen?replace("-do", "")}<#else>${table.entityPath?replace("DO", "")}</#if>")
4444
<#if kotlin>
4545
class ${table.controllerName}<#if superControllerClass??> : ${superControllerClass}()</#if>
4646
<#else>
@@ -72,11 +72,11 @@ public class ${table.controllerName} {
7272

7373
@GetMapping("/page")
7474
public PageResponseVO<${entity}> page(
75+
@RequestParam(name = "page", required = false, defaultValue = "0")
76+
@Min(value = 0, message = "{page.number.min}") Integer page,
7577
@RequestParam(name = "count", required = false, defaultValue = "10")
7678
@Min(value = 1, message = "{page.count.min}")
77-
@Max(value = 30, message = "{page.count.max}") Integer count,
78-
@RequestParam(name = "page", required = false, defaultValue = "0")
79-
@Min(value = 0, message = "{page.number.min}") Integer page
79+
@Max(value = 30, message = "{page.count.max}") Integer count
8080
) {
8181
return null;
8282
}

0 commit comments

Comments
 (0)