Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no commit message

Browse Source
This commit is contained in:
西城念云 2020-01-06 14:56:48 +08:00
parent 5c31f9e514
commit 2cd9764caf
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi/pom.xml
View File

@ -238,8 +238,14 @@
<artifactId>velocity</artifactId> <artifactId>velocity</artifactId>
<version>${velocity.version}</version> <version>${velocity.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>RELEASE</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>

19
ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
View File

@ -1,12 +1,5 @@
package com.ruoyi.framework.web.controller; 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.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.HttpStatus; 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.PageDomain;
import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.framework.web.page.TableSupport; 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层通用数据处理 * web层通用数据处理
* *
* @author ruoyi * @author ruoyi
*/ */
public class BaseController public class BaseController
@ -74,7 +75,7 @@ public class BaseController
/** /**
* 响应返回结果 * 响应返回结果
* *
* @param rows 影响行数 * @param rows 影响行数
* @return 操作结果 * @return 操作结果
*/ */

1
ruoyi/src/main/java/com/ruoyi/project/mr/service/impl/BaseCompanyServiceImpl.java
View File

@ -104,7 +104,6 @@ public class BaseCompanyServiceImpl implements IBaseCompanyService
@Override @Override
public int updateBaseCompanyEnabled(BaseCompany baseCompany) public int updateBaseCompanyEnabled(BaseCompany baseCompany)
{ {
baseCompany.setUpdateTime(DateUtils.getNowDate());
return baseCompanyMapper.updateBaseCompany(baseCompany); return baseCompanyMapper.updateBaseCompany(baseCompany);
} }