diff --git a/ruoyi-ui/src/assets/images/login-background.jpg b/ruoyi-ui/src/assets/images/login-background.jpg
index 8a89eb8..78e165e 100644
Binary files a/ruoyi-ui/src/assets/images/login-background.jpg and b/ruoyi-ui/src/assets/images/login-background.jpg differ
diff --git a/ruoyi-ui/src/views/system/album/index.vue b/ruoyi-ui/src/views/system/album/index.vue
index d2be59e..6761310 100644
--- a/ruoyi-ui/src/views/system/album/index.vue
+++ b/ruoyi-ui/src/views/system/album/index.vue
@@ -9,86 +9,86 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="创建人ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建人ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门ID" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="描述" prop="description">
-        <el-input
-          v-model="queryParams.description"
-          placeholder="请输入描述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核状态" prop="auditState">
-        <el-input
-          v-model="queryParams.auditState"
-          placeholder="请输入审核状态"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="编码" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="请输入编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="宽度" prop="width">
-        <el-input
-          v-model="queryParams.width"
-          placeholder="请输入宽度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="高度" prop="height">
-        <el-input
-          v-model="queryParams.height"
-          placeholder="请输入高度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="点击数" prop="hit">
-        <el-input
-          v-model="queryParams.hit"
-          placeholder="请输入点击数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="点赞数" prop="upVote">
-        <el-input
-          v-model="queryParams.upVote"
-          placeholder="请输入点赞数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否开启评论" prop="commentFlag">
-        <el-input
-          v-model="queryParams.commentFlag"
-          placeholder="请输入是否开启评论"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="创建人ID" prop="userId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userId"-->
+<!--          placeholder="请输入创建人ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="部门ID" prop="deptId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.deptId"-->
+<!--          placeholder="请输入部门ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="描述" prop="description">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.description"-->
+<!--          placeholder="请输入描述"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="审核状态" prop="auditState">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.auditState"-->
+<!--          placeholder="请输入审核状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="编码" prop="code">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.code"-->
+<!--          placeholder="请输入编码"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="宽度" prop="width">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.width"-->
+<!--          placeholder="请输入宽度"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="高度" prop="height">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.height"-->
+<!--          placeholder="请输入高度"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="点击数" prop="hit">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.hit"-->
+<!--          placeholder="请输入点击数"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="点赞数" prop="upVote">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.upVote"-->
+<!--          placeholder="请输入点赞数"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否开启评论" prop="commentFlag">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.commentFlag"-->
+<!--          placeholder="请输入是否开启评论"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -174,7 +174,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
diff --git a/ruoyi-ui/src/views/system/category/index.vue b/ruoyi-ui/src/views/system/category/index.vue
index fab0424..01c0a2f 100644
--- a/ruoyi-ui/src/views/system/category/index.vue
+++ b/ruoyi-ui/src/views/system/category/index.vue
@@ -107,10 +107,10 @@
       <el-table-column label="分类名称" align="center" prop="categoryName" />
 <!--      <el-table-column label="父ID" align="center" prop="parentId" />-->
 <!--      <el-table-column label="ids" align="center" prop="ancestors" />-->
-      <el-table-column label="排序" align="center" prop="sort" />
+<!--      <el-table-column label="排序" align="center" prop="sort" />-->
       <el-table-column label="分类描述" align="center" prop="description" />
-      <el-table-column label="语言标签" align="center" prop="categoryTags" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="语言标签" align="center" prop="tagName" />
+<!--      <el-table-column label="状态" align="center" prop="status" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -145,8 +145,15 @@
         <el-form-item label="分类名称" prop="categoryName">
           <el-input v-model="form.categoryName" placeholder="请输入分类名称" />
         </el-form-item>
-        <el-form-item label="上级分类" prop="parentId">
-          <el-input v-model="form.parentId" placeholder="请选择上级分类" />
+<!--        <el-form-item label="上级分类" prop="parentId">-->
+<!--          <el-input v-model="form.parentId" placeholder="请选择上级分类" />-->
+<!--        </el-form-item>-->
+
+        <el-form-item label="上级分类" prop="ids">
+          <el-select v-model="form.parentId" clearable>
+            <el-option v-for="(item, index) in columnList" :key="index"
+                       :label="item.categoryName" :value="item.categoryId"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="排序" prop="sort">
           <el-input v-model="form.sort" placeholder="请输入排序" />
@@ -157,8 +164,15 @@
 <!--        <el-form-item label="删除标志" prop="delFlag">-->
 <!--          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="语言标签" prop="categoryTags">
-          <el-input v-model="form.categoryTags" placeholder="请选择语言标签" />
+<!--        <el-form-item label="语言标签" prop="categoryTags">-->
+<!--          <el-input v-model="form.categoryTags" placeholder="请选择语言标签" />-->
+<!--        </el-form-item>-->
+
+        <el-form-item label="语言标签" prop="tags">
+          <el-select v-model="form.categoryTags" clearable>
+            <el-option v-for="(item, index) in tagList" :key="index"
+                       :label="item.tagName" :value="item.tagId"></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -171,6 +185,8 @@
 
 <script>
 import { listCategory, getCategory, delCategory, addCategory, updateCategory } from "@/api/system/category";
+// import { listCategory } from "@/api/system/category";
+import { listTags } from "@/api/system/tags";
 
 export default {
   name: "Category",
@@ -190,6 +206,8 @@ export default {
       total: 0,
       // 文章分类管理表格数据
       categoryList: [],
+      columnList:[], // 所属栏目
+      tagList:[], // 标签
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -215,6 +233,8 @@ export default {
   },
   created() {
     this.getList();
+    // 栏目 标签
+    this.getColumList()
   },
   methods: {
     /** 查询文章分类管理列表 */
@@ -226,6 +246,14 @@ export default {
         this.loading = false;
       });
     },
+    getColumList(){
+      listCategory().then(res=>{
+        this.columnList = res.rows
+      })
+      listTags().then(res=>{
+        this.tagList = res.rows
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -278,6 +306,7 @@ export default {
       const categoryId = row.categoryId || this.ids
       getCategory(categoryId).then(response => {
         this.form = response.data;
+        this.form.categoryTags = Number( this.form.categoryTags)
         this.open = true;
         this.title = "修改文章分类管理";
       });
diff --git a/ruoyi-ui/src/views/system/material/index.vue b/ruoyi-ui/src/views/system/material/index.vue
index 62943f5..a1e3fb7 100644
--- a/ruoyi-ui/src/views/system/material/index.vue
+++ b/ruoyi-ui/src/views/system/material/index.vue
@@ -291,12 +291,12 @@ export default {
   methods: {
     // input(data){
     //   console.log(data)
-      
+
     // },
     openDialog(){
       this.$refs.materialDialog.init()
     },
-   
+
     /** 查询素材管理列表 */
     getList() {
       this.loading = true;