ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-15 21:00:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0.x' into dev

Browse Source 
# Conflicts:
#	README.md
#	continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java
#	continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java
#	continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java
#	continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java
#	continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java
#	continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DeptReq.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MenuReq.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/RoleReq.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
#	continew-admin-ui/src/components/footer/index.vue
#	continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java
#	continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java
#	continew-admin-webapi/src/main/resources/config/application-dev.yml
#	continew-admin-webapi/src/main/resources/config/application-prod.yml
#	pom.xml
This commit is contained in:
Charles7c
2023-11-04 23:57:06 +08:00
parent dd4ca1e2a5 3738fa4872
commit 51e1cd9307
79 changed files with 256 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/query/TableQuery.java
View File

@@ -16,6 +16,7 @@
package top.charles7c.cnadmin.tool.model.query;
import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
@@ -32,6 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "表信息查询条件")
public class TableQuery implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**