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

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

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

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

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