From 08cb9955c76e431b6167b979f94649d40e0a2ef1 Mon Sep 17 00:00:00 2001
From: dearliuliu0522 <dearliuliu0522@gmail.com>
Date: Fri, 22 Apr 2022 15:10:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=8F=E6=84=9F?=
 =?UTF-8?q?=E8=AF=8D=E8=A1=A8=E6=A0=BC=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=88=97=E5=86=85=E5=AE=B9=E9=94=99=E8=AF=AF=EF=BC=8C=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=88=97=E6=A0=87=E7=AD=BE=E4=B9=8B=E9=97=B4=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/sensitiveWord/index.vue        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/yudao-ui-admin/src/views/system/sensitiveWord/index.vue b/yudao-ui-admin/src/views/system/sensitiveWord/index.vue
index cbc98d3e3..fff780038 100644
--- a/yudao-ui-admin/src/views/system/sensitiveWord/index.vue
+++ b/yudao-ui-admin/src/views/system/sensitiveWord/index.vue
@@ -53,14 +53,17 @@
       </el-table-column>
       <el-table-column label="描述" align="center" prop="description"/>
       <el-table-column label="标签" align="center" prop="tags">
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <el-tag :disable-transitions="true" v-for="(tag, index) in scope.row.tags" :index="index">
             {{ tag }}
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -324,3 +327,9 @@ export default {
   }
 };
 </script>
+
+<style rel="stylesheet/scss" lang="scss">
+  .el-tag+.el-tag {
+    margin-left: 10px;
+  }
+</style>

From 80629da1bdec54ad42c43a58192bc24e6cfa877c Mon Sep 17 00:00:00 2001
From: dearliuliu0522 <dearliuliu0522@gmail.com>
Date: Fri, 22 Apr 2022 16:13:04 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=EF=BC=8C=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/views/system/dict/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-ui-admin/src/views/system/dict/index.vue b/yudao-ui-admin/src/views/system/dict/index.vue
index b5d0620fe..88a04f72a 100644
--- a/yudao-ui-admin/src/views/system/dict/index.vue
+++ b/yudao-ui-admin/src/views/system/dict/index.vue
@@ -75,7 +75,7 @@
           <el-input v-model="form.name" placeholder="请输入字典名称" />
         </el-form-item>
         <el-form-item label="字典类型" prop="type">
-          <el-input v-model="form.type" placeholder="请输入字典类型" />
+          <el-input :disabled="form.id !== null" v-model="form.type" placeholder="请输入字典类型" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">

From 4f6984b02141bb30a4dac47d10be5580d0e52794 Mon Sep 17 00:00:00 2001
From: dearliuliu0522 <dearliuliu0522@gmail.com>
Date: Fri, 22 Apr 2022 16:28:52 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E6=97=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E5=85=83=E7=B4=A0=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/views/system/dict/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-ui-admin/src/views/system/dict/index.vue b/yudao-ui-admin/src/views/system/dict/index.vue
index 88a04f72a..b5d0620fe 100644
--- a/yudao-ui-admin/src/views/system/dict/index.vue
+++ b/yudao-ui-admin/src/views/system/dict/index.vue
@@ -75,7 +75,7 @@
           <el-input v-model="form.name" placeholder="请输入字典名称" />
         </el-form-item>
         <el-form-item label="字典类型" prop="type">
-          <el-input :disabled="form.id !== null" v-model="form.type" placeholder="请输入字典类型" />
+          <el-input v-model="form.type" placeholder="请输入字典类型" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">

From c348fc2a19104550c1bc5665d59a3e84876d7a54 Mon Sep 17 00:00:00 2001
From: dearliuliu0522 <dearliuliu0522@gmail.com>
Date: Fri, 22 Apr 2022 16:34:52 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E6=97=B6?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0=E4=B8=BA=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/views/system/dict/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-ui-admin/src/views/system/dict/index.vue b/yudao-ui-admin/src/views/system/dict/index.vue
index b5d0620fe..39770abfd 100644
--- a/yudao-ui-admin/src/views/system/dict/index.vue
+++ b/yudao-ui-admin/src/views/system/dict/index.vue
@@ -75,7 +75,7 @@
           <el-input v-model="form.name" placeholder="请输入字典名称" />
         </el-form-item>
         <el-form-item label="字典类型" prop="type">
-          <el-input v-model="form.type" placeholder="请输入字典类型" />
+          <el-input :disabled="typeof form.id !== 'undefined'" v-model="form.type" placeholder="请输入字典类型" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">