From 1377e545f9c63291e15c6640f290e012991c1213 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 08 七月 2024 09:28:36 +0800
Subject: [PATCH] 最新版本
---
admin/src/views/timer/timer.vue | 2 +-
admin/src/views/business/blackmailPersonnel.vue | 3 +--
admin/src/views/business/freezePersonnel.vue | 2 +-
server/system_timer/src/main/java/com/doumee/config/biz/VisitServiceJobBiz.java | 2 +-
server/system_service/src/main/java/com/doumee/config/mybatis/EasySqlInjector.java | 2 --
5 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/business/blackmailPersonnel.vue b/admin/src/views/business/blackmailPersonnel.vue
index e5208c4..5093b78 100644
--- a/admin/src/views/business/blackmailPersonnel.vue
+++ b/admin/src/views/business/blackmailPersonnel.vue
@@ -52,8 +52,7 @@
</template>
</el-table-column>
<el-table-column prop="visitCompanyName" label="缁勭粐" min-width="100px"></el-table-column>
- <el-table-column prop="optTime" label="鎿嶄綔鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="creatorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="optRemark" label="鎿嶄綔淇℃伅" min-width="300px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete'])"
label="鎿嶄綔"
diff --git a/admin/src/views/business/freezePersonnel.vue b/admin/src/views/business/freezePersonnel.vue
index af0cf2e..aea6fe8 100644
--- a/admin/src/views/business/freezePersonnel.vue
+++ b/admin/src/views/business/freezePersonnel.vue
@@ -40,7 +40,7 @@
<el-table-column prop="companyName" label="閮ㄩ棬" min-width="100px"></el-table-column>
<el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
<el-table-column prop="visitsLastDate" label="鏈�鍚庝竴娆￠棬绂佹椂闂�" min-width="100px"></el-table-column>
- <el-table-column prop="userActionType1" label="鍐荤粨鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="optRemark" label="鍐荤粨淇℃伅" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete'])"
label="鎿嶄綔"
diff --git a/admin/src/views/timer/timer.vue b/admin/src/views/timer/timer.vue
index 9dccf33..6eeca3f 100644
--- a/admin/src/views/timer/timer.vue
+++ b/admin/src/views/timer/timer.vue
@@ -1,5 +1,5 @@
<template>
- <TableLayout :permissions="['business:devices:query']">
+ <TableLayout :permissions="['business:quartz:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="Bean鍚嶇О" prop="beanName">
diff --git a/server/system_service/src/main/java/com/doumee/config/mybatis/EasySqlInjector.java b/server/system_service/src/main/java/com/doumee/config/mybatis/EasySqlInjector.java
index 1e97d85..baabea5 100644
--- a/server/system_service/src/main/java/com/doumee/config/mybatis/EasySqlInjector.java
+++ b/server/system_service/src/main/java/com/doumee/config/mybatis/EasySqlInjector.java
@@ -2,8 +2,6 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
-import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
-import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn;
import com.github.yulichang.injector.MPJSqlInjector;
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/biz/VisitServiceJobBiz.java b/server/system_timer/src/main/java/com/doumee/config/biz/VisitServiceJobBiz.java
similarity index 96%
rename from server/system_timer/src/main/java/com/doumee/jobs/biz/VisitServiceJobBiz.java
rename to server/system_timer/src/main/java/com/doumee/config/biz/VisitServiceJobBiz.java
index 9564701..479068f 100644
--- a/server/system_timer/src/main/java/com/doumee/jobs/biz/VisitServiceJobBiz.java
+++ b/server/system_timer/src/main/java/com/doumee/config/biz/VisitServiceJobBiz.java
@@ -1,4 +1,4 @@
-package com.doumee.jobs.biz;
+package com.doumee.config.biz;
import com.doumee.jobs.JobService;
import com.doumee.jobs.fegin.VisitServiceFegin;
--
Gitblit v1.9.3