Merge branch 'develop' into feature/order

# Conflicts:
#	tashow-module/pom.xml
#	tashow-module/tashow-module-infra/src/main/resources/application-local.yaml
This commit is contained in:
2025-10-15 11:33:01 +08:00
141 changed files with 4156 additions and 1744 deletions

View File

@@ -14,8 +14,7 @@ import java.io.Serializable;
@Data
public class PageParam implements Serializable {
private static final Integer PAGE_NO = 1;
private static final Integer PAGE_SIZE = 10;
/**
* 每页条数 - 不分页
@@ -29,7 +28,7 @@ public class PageParam implements Serializable {
*/
@NotNull(message = "页码不能为空")
@Min(value = 1, message = "页码最小值为 1")
private Integer pageNo = PAGE_NO;
private Integer pageNo = 1;
/**
* 每页条数,最大值为 100"
@@ -37,6 +36,6 @@ public class PageParam implements Serializable {
@NotNull(message = "每页条数不能为空")
@Min(value = 1, message = "每页条数最小值为 1")
@Max(value = 100, message = "每页条数最大值为 100")
private Integer pageSize = PAGE_SIZE;
private Integer pageSize = 10;
}

View File

@@ -27,6 +27,15 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.github.xingfudeshi</groupId>
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
</dependency>
<!-- Web 相关 -->
<dependency>
<groupId>org.springframework.boot</groupId>