abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wzj-main' into wzj-main

Browse Source
This commit is contained in:
曹佳豪 2025-08-13 17:29:53 +08:00
commit 3fb0972dd0
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java
View File

@ -53,7 +53,6 @@ public class MemberController extends BaseController {
} }
@Tag(name ="导出会员信息列表") @Tag(name ="导出会员信息列表")
@SaCheckPermission("ums:member:export")
@Log(title = "会员信息", businessType = BusinessType.EXPORT) @Log(title = "会员信息", businessType = BusinessType.EXPORT)
@PostMapping("export") @PostMapping("export")
public R<String> export(MemberBO query) { public R<String> export(MemberBO query) {
@ -63,7 +62,6 @@ public class MemberController extends BaseController {
} }
@Tag(name ="获取会员信息详细信息") @Tag(name ="获取会员信息详细信息")
@SaCheckPermission("ums:member:query")
@GetMapping(value = "{id}") @GetMapping(value = "{id}")
public R<MemberVO> getInfo(@PathVariable("id") Long id) { public R<MemberVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id))); return R.ok(convert.toVO(service.getById(id)));

6
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberAccount.java
View File

@ -33,13 +33,9 @@ public class MemberAccount extends BaseAudit {
private String name; private String name;
/**
* 账户类型 1 用户 2 商家 3 代理 4 平台
*/
private Integer type; private Integer type;
@Schema(description ="积分余额") @Schema(description ="积分")
private BigDecimal integral; private BigDecimal integral;
@Schema(description ="钱包") @Schema(description ="钱包")