From 1c25b34120d8da18293e6c2df5becb9f1f40ccd6 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Mon, 15 Nov 2021 20:54:09 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=9C=AA=E5=AE=8C=E6=88=90=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/src/views/tool/gen/editTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index 6f3930c..81a6f7c 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -51,7 +51,7 @@
               <el-checkbox v-model="scope.row.isList"></el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="查询" min-width="5%">
+          <!-- <el-table-column label="查询" min-width="5%">
             <template slot-scope="scope">
               <el-checkbox v-model="scope.row.isQuery"></el-checkbox>
             </template>
@@ -69,7 +69,7 @@
                 <el-option label="BETWEEN" value="BETWEEN" />
               </el-select>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="显示类型" min-width="12%">
             <template slot-scope="scope">
               <el-select v-model="scope.row.htmlType">

From eb6bd4c1c28d3afaf43bdf38804719ef8c07e599 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Mon, 15 Nov 2021 20:54:53 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=AF=BC=E5=85=A5=E7=BC=96=E8=BE=91=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=95=B0=E6=8D=AE=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.CodeGenerator/CodeGeneratorTool.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 9f547cc..acd00b9 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -482,6 +482,7 @@ namespace ZR.CodeGenerator
                     Create_by = genTable.Create_by,
                     Create_time = DateTime.Now,
                     IsInsert = !column.IsIdentity,//非自增字段都需要插入
+                    IsEdit = true,
                     IsQuery = false,
                     HtmlType = GenConstants.HTML_INPUT
                 };
@@ -509,9 +510,9 @@ namespace ZR.CodeGenerator
                     genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA;
                 }
                 //编辑字段
-                if (GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) && !column.IsIdentity && !column.IsPrimarykey)
+                if (column.IsIdentity || column.IsPrimarykey || GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) )
                 {
-                    genTableColumn.IsEdit = true;
+                    genTableColumn.IsEdit = false;
                 }
                 //列表字段
                 if (!GenConstants.COLUMNNAME_NOT_LIST.Any(f => column.DbColumnName.Contains(f) && !column.IsPrimarykey))

From 789ee75500bf0979d5f5bf69b9fb0111b933cbba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 16 Nov 2021 17:57:46 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix=20SqlServer=E9=83=A8=E9=97=A8=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=E4=B8=8D?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 document/admin-sqlserver.sql | Bin 111702 -> 111694 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/document/admin-sqlserver.sql b/document/admin-sqlserver.sql
index d4d39a320984b55836d719bf3c4f04ea3171fa54..2d60ad394c88dcc22eb328af0c05fc0d913be057 100644
GIT binary patch
delta 31
pcmV+)0O0@D=myT{2C#G}vz{N60h4|v5R-l%kb|%)x3DS!ritx|4fg;5

delta 78
zcmX^2g6-N1whbj3lQU#QCf9MYO}0>WnyjbHF*(7UV{@Of4&&rHHG#=>@(S1#Ozu<W
Rn8d}=yg_UG1}(;Uod7t)8Z7_-


From cebfa5686d63642d3e55d9f30e19c77e91c28fc2 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Tue, 16 Nov 2021 21:24:05 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=BF=E6=8D=A2node-sass=E4=B8=BAsass?=
 =?UTF-8?q?=EF=BC=8Csass-loader=E5=8D=87=E7=BA=A7=E4=B8=BA10.1.0=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8dev=20=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/README.md                             | 2 +-
 ZR.Vue/package.json                          | 9 +++------
 ZR.Vue/src/components/HeaderSearch/index.vue | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ZR.Vue/README.md b/ZR.Vue/README.md
index b3030b7..6508c90 100644
--- a/ZR.Vue/README.md
+++ b/ZR.Vue/README.md
@@ -30,7 +30,7 @@ npm run build:prod
 ```
 
 # 插件说明
-### Autoprefixer
+### Autoprefixer （已删除）
 浏览器自动补全前缀
 例如：
 ```
diff --git a/ZR.Vue/package.json b/ZR.Vue/package.json
index fcb7cc9..873c7e6 100644
--- a/ZR.Vue/package.json
+++ b/ZR.Vue/package.json
@@ -51,7 +51,6 @@
     "@vue/cli-plugin-babel": "4.4.4",
     "@vue/cli-plugin-eslint": "4.4.4",
     "@vue/cli-service": "4.4.4",
-    "autoprefixer": "9.5.1",
     "babel-eslint": "10.1.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "4.1.0",
@@ -59,13 +58,11 @@
     "eslint": "6.7.2",
     "eslint-plugin-vue": "6.2.2",
     "lint-staged": "8.1.5",
-    "node-sass": "4.14.1",
-    "runjs": "4.3.2",
-    "sass-loader": "8.0.2",
+    "sass": "1.32.13",
+    "runjs": "4.4.2",
+    "sass-loader": "10.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
-    "serve-static": "1.13.2",
     "svg-sprite-loader": "4.1.3",
-    "svgo": "2.8.0",
     "vue-template-compiler": "2.6.12"
   },
   "engines": {
diff --git a/ZR.Vue/src/components/HeaderSearch/index.vue b/ZR.Vue/src/components/HeaderSearch/index.vue
index 2980c06..f814c29 100644
--- a/ZR.Vue/src/components/HeaderSearch/index.vue
+++ b/ZR.Vue/src/components/HeaderSearch/index.vue
@@ -168,7 +168,7 @@ export default {
     display: inline-block;
     vertical-align: middle;
 
-    /deep/ .el-input__inner {
+    ::v-deep .el-input__inner {
       border-radius: 0;
       border: 0;
       padding-left: 0;

From a9be8934c69c214cdc2897c41c508456354b13de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 17 Nov 2021 12:33:50 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E6=95=B0=E5=AD=97=E5=AD=97=E6=AF=8D=E7=BB=84?=
 =?UTF-8?q?=E5=90=88=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Controllers/System/SysLoginController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
index 93af7f7..13cfd24 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
@@ -137,7 +137,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         {
             string uuid = Guid.NewGuid().ToString().Replace("-", "");
             var code = SecurityCodeHelper.GetRandomEnDigitalText(4);
-            var imgByte = SecurityCodeHelper.GetGifEnDigitalCodeByte(code);
+            var imgByte = SecurityCodeHelper.GetEnDigitalCodeByte(code);
             string base64Str = Convert.ToBase64String(imgByte);
             CacheHelper.SetCache(uuid, code);
             var obj = new { uuid, img = base64Str };// File(stream, "image/png")