diff --git a/CoreCms.Net.Model/Entities/Shop/CoreCmsArea.cs b/CoreCms.Net.Model/Entities/Shop/CoreCmsArea.cs index 5424ea58..62b71dec 100644 --- a/CoreCms.Net.Model/Entities/Shop/CoreCmsArea.cs +++ b/CoreCms.Net.Model/Entities/Shop/CoreCmsArea.cs @@ -49,16 +49,9 @@ namespace CoreCms.Net.Model.Entities /// [Display(Name = "地区名称")] [SugarColumn(ColumnDescription = "地区名称", IsNullable = true)] - [StringLength(50, ErrorMessage = "【{0}】不能超过{1}字符长度")] + [StringLength(20, ErrorMessage = "【{0}】不能超过{1}字符长度")] public System.String name { get; set; } /// - /// 邮编 - /// - [Display(Name = "邮编")] - [SugarColumn(ColumnDescription = "邮编", IsNullable = true)] - [StringLength(10, ErrorMessage = "【{0}】不能超过{1}字符长度")] - public System.String postalCode { get; set; } - /// /// 地区排序 /// [Display(Name = "地区排序")] diff --git a/CoreCms.Net.Repository/Shop/CoreCmsAreaRepository.cs b/CoreCms.Net.Repository/Shop/CoreCmsAreaRepository.cs index 596303f6..edc16397 100644 --- a/CoreCms.Net.Repository/Shop/CoreCmsAreaRepository.cs +++ b/CoreCms.Net.Repository/Shop/CoreCmsAreaRepository.cs @@ -66,7 +66,6 @@ namespace CoreCms.Net.Repository } //事物处理过程开始 oldModel.name = entity.name; - oldModel.postalCode = entity.postalCode; oldModel.sort = entity.sort; //事物处理过程结束 diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs index 43f4690e..6bfa238f 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs @@ -112,9 +112,6 @@ namespace CoreCms.Net.Web.Admin.Controllers case "name": orderEx = p => p.name; break; - case "postalCode": - orderEx = p => p.postalCode; - break; case "sort": orderEx = p => p.sort; break; @@ -145,9 +142,6 @@ namespace CoreCms.Net.Web.Admin.Controllers //地区名称 nvarchar var name = Request.Form["name"].FirstOrDefault(); if (!string.IsNullOrEmpty(name)) @where = @where.And(p => p.name.Contains(name)); - //邮编 nvarchar - var postalCode = Request.Form["postalCode"].FirstOrDefault(); - if (!string.IsNullOrEmpty(postalCode)) @where = @where.And(p => p.postalCode.Contains(postalCode)); //地区排序 int var sort = Request.Form["sort"].FirstOrDefault().ObjectToInt(0); if (sort > 0) @where = @where.And(p => p.sort == sort); diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/create.html index 4c56cc26..90901a4e 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/create.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/create.html @@ -17,13 +17,6 @@ -
- -
- -
-
-
@@ -52,9 +45,7 @@ , coreHelper = layui.coreHelper; form.verify({ - verifyname: [/^[\S]{0,50}$/, '地区名称最大只允许输入50位字符,且不能出现空格'], - verifypostalCode: [/^[\S]{0,10}$/, '邮编最大只允许输入10位字符,且不能出现空格'], }); //重载form form.render(null, 'LAY-app-CoreCmsArea-createForm'); diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/edit.html index 19631a36..0de12803 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/edit.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/edit.html @@ -2,30 +2,6 @@
- -
@@ -33,14 +9,6 @@
-
- -
- - -
-
-
@@ -69,9 +37,7 @@ , coreHelper = layui.coreHelper; form.verify({ - verifyname: [/^[\S]{0,50}$/, '地区名称最大只允许输入50位字符,且不能出现空格'], - verifypostalCode: [/^[\S]{0,10}$/, '邮编最大只允许输入10位字符,且不能出现空格'], }); //重载form form.render(null, 'LAY-app-CoreCmsArea-editForm'); diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/index.html index 89d9961b..837ddf98 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/area/index.html @@ -137,7 +137,6 @@ { field: 'parentId', title: '父级ID', sort: false }, { field: 'depth', title: '地区深度', sort: false }, { field: 'name', title: '地区名称', sort: false }, - { field: 'postalCode', title: '邮编', sort: false }, { field: 'sort', title: '地区排序', sort: false }, { title: '操作', toolbar: '#areaTbBar', unresize: true, diff --git a/数据库/MySql/20221001/完整脚本/coreshop20221001.rar b/数据库/MySql/20221001/完整脚本/coreshop20221001.rar new file mode 100644 index 00000000..a114ed4d Binary files /dev/null and b/数据库/MySql/20221001/完整脚本/coreshop20221001.rar differ diff --git a/数据库/MySql/20221001/更新脚本/更新脚本.rar b/数据库/MySql/20221001/更新脚本/更新脚本.rar new file mode 100644 index 00000000..565a4703 Binary files /dev/null and b/数据库/MySql/20221001/更新脚本/更新脚本.rar differ diff --git a/数据库/MySql/数据库更新日志.txt b/数据库/MySql/数据库更新日志.txt index fd800f23..76cdb7ed 100644 --- a/数据库/MySql/数据库更新日志.txt +++ b/数据库/MySql/数据库更新日志.txt @@ -1,3 +1,7 @@ +2022-10-01 +【删除】表【CoreCmsArea】【postalCode】字段, +【更新】表【CoreCmsArea】更新最新的全国行政区划, + 2022-09-19 【新增】表【CoreCmsPrinter】打印机列表表。 【调整】表【CoreCmsUserCheckInDetails】字段【checkInData】数据类型为date。 diff --git a/数据库/SqlServer/20221001/完整数据/CoreShopProfessional20221001.rar b/数据库/SqlServer/20221001/完整数据/CoreShopProfessional20221001.rar new file mode 100644 index 00000000..a700cdb4 Binary files /dev/null and b/数据库/SqlServer/20221001/完整数据/CoreShopProfessional20221001.rar differ diff --git a/数据库/SqlServer/20221001/更新脚本/更新脚本.rar b/数据库/SqlServer/20221001/更新脚本/更新脚本.rar new file mode 100644 index 00000000..a42a357b Binary files /dev/null and b/数据库/SqlServer/20221001/更新脚本/更新脚本.rar differ diff --git a/数据库/SqlServer/数据库更新日志.txt b/数据库/SqlServer/数据库更新日志.txt index cdbb713f..fa175a17 100644 --- a/数据库/SqlServer/数据库更新日志.txt +++ b/数据库/SqlServer/数据库更新日志.txt @@ -1,3 +1,7 @@ +2022-10-01 +【删除】表【CoreCmsArea】【postalCode】字段, +【更新】表【CoreCmsArea】更新最新的全国行政区划, + 2022-09-19 【新增】表【CoreCmsPrinter】打印机列表表