jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Browse Source 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
	ry.sh
This commit is contained in:
疯狂的狮子li
2021-05-31 13:21:29 +08:00
parent 7b7f098dee c105a63c8b
commit d7359122b4
3 changed files with 77 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
View File

@ -13,7 +13,7 @@ import java.util.Date;
/**
* web层通用数据处理
*
*
* @author ruoyi
*/
public class BaseController
@ -39,7 +39,7 @@ public class BaseController
/**
* 响应返回结果
*
*
* @param rows 影响行数
* @return 操作结果
*/