diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 695489b6..82535a8f 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -35,7 +35,7 @@ - + diff --git a/Admin.NET/Admin.NET.Core/Service/Region/Dto/RegionInput.cs b/Admin.NET/Admin.NET.Core/Service/Region/Dto/RegionInput.cs index 8c127155..2193b5c7 100644 --- a/Admin.NET/Admin.NET.Core/Service/Region/Dto/RegionInput.cs +++ b/Admin.NET/Admin.NET.Core/Service/Region/Dto/RegionInput.cs @@ -34,6 +34,7 @@ public class QueryRegionInput /// 父节点Id /// public long? Pid { get; set; } + /// /// 名称 /// @@ -43,6 +44,7 @@ public class QueryRegionInput /// 编码 /// public string Code { get; set; } + /// /// 类型 /// diff --git a/Web/package.json b/Web/package.json index 49ccd7b8..7441fd96 100644 --- a/Web/package.json +++ b/Web/package.json @@ -2,7 +2,7 @@ "name": "admin.net.pro", "type": "module", "version": "2.4.33", - "lastBuildTime": "2024.10.19", + "lastBuildTime": "2024.10.20", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -91,13 +91,13 @@ "@vitejs/plugin-vue-jsx": "^4.0.1", "@vue/compiler-sfc": "^3.5.12", "code-inspector-plugin": "^0.17.2", - "eslint": "^9.12.0", - "eslint-plugin-vue": "^9.29.0", + "eslint": "^9.13.0", + "eslint-plugin-vue": "^9.29.1", "globals": "^15.11.0", "less": "^4.2.0", "prettier": "^3.3.3", "rollup-plugin-visualizer": "^5.12.0", - "sass": "^1.80.2", + "sass": "^1.80.3", "terser": "^5.36.0", "typescript": "^5.6.3", "vite": "^5.4.9", diff --git a/Web/src/api-services/apis/sys-region-api.ts b/Web/src/api-services/apis/sys-region-api.ts index 08fd1d1a..de351bac 100644 --- a/Web/src/api-services/apis/sys-region-api.ts +++ b/Web/src/api-services/apis/sys-region-api.ts @@ -25,10 +25,10 @@ import { AdminResultSqlSugarPagedListSysRegion } from '../models'; import { DeleteRegionInput } from '../models'; import { GenOrgInput } from '../models'; import { PageRegionInput } from '../models'; +import { QueryRegionInput } from '../models'; import { SyncInput } from '../models'; import { TiandituInput } from '../models'; import { UpdateRegionInput } from '../models'; -import { QueryRegionInput } from '../models/query-region-input'; /** * SysRegionApi - axios parameter creator * @export diff --git a/Web/src/api-services/models/index.ts b/Web/src/api-services/models/index.ts index 39aa92bf..ec3db255 100644 --- a/Web/src/api-services/models/index.ts +++ b/Web/src/api-services/models/index.ts @@ -295,6 +295,7 @@ export * from './print-type-enum'; export * from './promotion'; export * from './property-attributes'; export * from './property-info'; +export * from './query-region-input'; export * from './refund-request-input'; export * from './reset-pwd-user-input'; export * from './role-api-input'; diff --git a/Web/src/api-services/models/query-region-input.ts b/Web/src/api-services/models/query-region-input.ts index c3627332..3ec1f653 100644 --- a/Web/src/api-services/models/query-region-input.ts +++ b/Web/src/api-services/models/query-region-input.ts @@ -26,7 +26,7 @@ export interface QueryRegionInput { * @type {number} * @memberof QueryRegionInput */ - pid?: number; + pid?: number | null; /** * 名称