diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
index 5b906686..2798cc72 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
@@ -194,8 +194,9 @@ public class MaTypeController extends BaseController {
     @GetMapping("/getListByMaType")
     public AjaxResult getListByMaType(@RequestParam(required = false) Long typeId,
                                       @RequestParam(required = false) String typeName) {
+        startPage();
         List<MaType> listByMaType = iTypeService.getListByParentId(typeId, typeName);
-        return success(listByMaType);
+        return success(getDataTable(listByMaType));
     }
 
     /**
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index a2e778f1..bdcccede 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -531,7 +531,7 @@
       company_id,
     </if>
     <if test="scrapReason != null and scrapReason != ''">
-      audit_remark,
+      remark,
     </if>
     <if test="scrapType != null and scrapType != ''">
       scrap_type,
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index 89204539..2888fb1d 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -347,7 +347,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join (select * from ma_type_file where file_type = '2') mtf2 on m.type_id = mtf2.type_id
         left join ma_type_keeper mtk on m.type_id = mtk.type_id
         left join sys_user su on mtk.user_id = su.user_id
-        where m.parent_id = #{typeId} and m.status = '0' and m.del_flag = '0'
+        where m.status = '0' and m.del_flag = '0'
+        <if test="typeId != null and typeId !=''">
+            AND m.parent_id = #{typeId}
+        </if>
         <if test="typeName != null and typeName !=''">
             AND type_name like concat('%',#{typeName},'%')
         </if>
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
index 8761c399..893996a8 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
@@ -293,7 +293,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                                 scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
                                 scrapApplyDetails.setCreateTime(new Date());
                                 scrapApplyDetails.setCompanyId((long) companyId);
-                                scrapApplyDetails.setAuditRemark(bean.getScrapReason());
+                                scrapApplyDetails.setRemark(bean.getScrapReason());
                                 //根据fileIds获取所有的图片地址
                                 if (StringUtils.isNotEmpty(bean.getFileIds())){
                                     String[] fileIsList = bean.getFileIds().split(",");
diff --git a/sgzb-ui/src/components/Editor/index.vue b/sgzb-ui/src/components/Editor/index.vue
index 44c545c2..722093cd 100644
--- a/sgzb-ui/src/components/Editor/index.vue
+++ b/sgzb-ui/src/components/Editor/index.vue
@@ -81,8 +81,8 @@ export default {
             [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
             [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
             [{ align: [] }],                                 // 对齐方式
-            ["clean"],                                       // 清除文本格式
-            ["link", "image", "video"]                       // 链接、图片、视频
+            ["clean"]                                        // 清除文本格式
+            // ["link", "image", "video"]                       // 链接、图片、视频
           ],
         },
         placeholder: "请输入内容",
diff --git a/sgzb-ui/src/views/system/user/index.vue b/sgzb-ui/src/views/system/user/index.vue
index 8ed460f3..f7fcafb6 100644
--- a/sgzb-ui/src/views/system/user/index.vue
+++ b/sgzb-ui/src/views/system/user/index.vue
@@ -135,17 +135,17 @@
                             >删除</el-button
                         >
                     </el-col>
-                    <el-col :span="1.5">
-                        <el-button
-                            type="info"
-                            plain
-                            icon="el-icon-upload2"
-                            size="mini"
-                            @click="handleImport"
-                            v-hasPermi="['system:user:import']"
-                            >导入</el-button
-                        >
-                    </el-col>
+<!--                    <el-col :span="1.5">-->
+<!--                        <el-button-->
+<!--                            type="info"-->
+<!--                            plain-->
+<!--                            icon="el-icon-upload2"-->
+<!--                            size="mini"-->
+<!--                            @click="handleImport"-->
+<!--                            v-hasPermi="['system:user:import']"-->
+<!--                            >导入</el-button-->
+<!--                        >-->
+<!--                    </el-col>-->
                     <el-col :span="1.5">
                         <el-button
                             type="warning"