From e975b41428824dcc93afabb7f63340c1c41dd782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 29 Oct 2019 18:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E4=B8=8D=E5=BE=80=E5=A4=87=E6=B3=A8=E9=87=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=86=99=E5=85=A5=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/log.html                         | 2 +-
 src/main/java/com/jsh/erp/service/log/LogService.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/erp_web/pages/manage/log.html b/erp_web/pages/manage/log.html
index a7e67f59..401ae04c 100644
--- a/erp_web/pages/manage/log.html
+++ b/erp_web/pages/manage/log.html
@@ -113,7 +113,7 @@
             pageList: initPageNum,
             columns: [[
                 {title: '操作模块', field: 'operation', width: 120},
-                {title: '操作详情', field: 'remark', width: 350},
+                {title: '操作详情', field: 'contentdetails', width: 350},
                 {title: '操作人员', field: 'username', width: 100, align: "center"},
                 {title: '操作状态',field: 'status',width:80,align:"center",formatter:function(value){
                     return value? "失败":"成功";
diff --git a/src/main/java/com/jsh/erp/service/log/LogService.java b/src/main/java/com/jsh/erp/service/log/LogService.java
index b7eccc69..b8b06bd2 100644
--- a/src/main/java/com/jsh/erp/service/log/LogService.java
+++ b/src/main/java/com/jsh/erp/service/log/LogService.java
@@ -206,7 +206,6 @@ public class LogService {
         Byte status = 0;
         log.setStatus(status);
         log.setContentdetails(type + getModule(apiName));
-        log.setRemark(type + getModule(apiName));
         try{
             logMapper.insertSelective(log);
         }catch(Exception e){