shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
张良(004796)
2024-04-22 18:52:44 +08:00
parent 280159225b
commit 2945b511c3
8 changed files with 85 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
View File

@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserPictures;
import com.ruoyi.xq.dto.admin.common.AuditFailReq;
import com.ruoyi.xq.dto.admin.user.UserPicturesAdminMergeVo;
import com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo;
import com.ruoyi.xq.dto.app.common.IdsReq;
import com.ruoyi.xq.enums.common.AuditEnum;
@@ -54,6 +55,13 @@ public class UserPicturesController extends BaseController {
return TableDataInfo.build(page);
}
@SaCheckPermission("xq:userPictures:merge")
@GetMapping("/list/merge")
public TableDataInfo<UserPicturesAdminMergeVo> listMerge(UserPicturesAdminMergeVo bo, PageQuery pageQuery) {
Page<UserPicturesAdminMergeVo> page = userPicturesService.pageAdminManager(pageQuery, bo);
return TableDataInfo.build(page);
}
/**
* 获取用户相册管理详细信息
*