From 2cd9764cafd3e978668c6e231dcde1722ee3f5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E5=9F=8E=E5=BF=B5=E4=BA=91?= <495888462@qq.com>
Date: Mon, 6 Jan 2020 14:56:48 +0800
Subject: [PATCH] no commit message

---
 ruoyi/pom.xml                                 |  8 +++++++-
 .../web/controller/BaseController.java        | 19 ++++++++++---------
 .../service/impl/BaseCompanyServiceImpl.java  |  1 -
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ruoyi/pom.xml b/ruoyi/pom.xml
index a80061ece..88bc24ce2 100644
--- a/ruoyi/pom.xml
+++ b/ruoyi/pom.xml
@@ -238,8 +238,14 @@
 			<artifactId>velocity</artifactId>
 			<version>${velocity.version}</version>
 		</dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
 
-	</dependencies>
+    </dependencies>
 
 	<build>
 		<finalName>${project.artifactId}</finalName>
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java b/ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
index ccc60a37d..b389efe93 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
@@ -1,12 +1,5 @@
 package com.ruoyi.framework.web.controller;
 
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.constant.HttpStatus;
@@ -17,10 +10,18 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.PageDomain;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.framework.web.page.TableSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+
+import java.beans.PropertyEditorSupport;
+import java.util.Date;
+import java.util.List;
 
 /**
  * web层通用数据处理
- * 
+ *
  * @author ruoyi
  */
 public class BaseController
@@ -74,7 +75,7 @@ public class BaseController
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param rows 影响行数
      * @return 操作结果
      */
diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/service/impl/BaseCompanyServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/mr/service/impl/BaseCompanyServiceImpl.java
index dce108320..eb63f22f0 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/mr/service/impl/BaseCompanyServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/mr/service/impl/BaseCompanyServiceImpl.java
@@ -104,7 +104,6 @@ public class BaseCompanyServiceImpl implements IBaseCompanyService
     @Override
     public int updateBaseCompanyEnabled(BaseCompany baseCompany)
     {
-        baseCompany.setUpdateTime(DateUtils.getNowDate());
         return baseCompanyMapper.updateBaseCompany(baseCompany);
     }