cs

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.payment;
 
-import com.github.microservice.models.type.PaymentDeviceType;
+import com.github.microservice.types.payment.PaymentDeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.school.CardInfoModel;
 import com.github.microservice.types.OrderState;

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/paySetting/ProjectPaySettingConfig.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.projectAbout.paySetting;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/paySetting/ProjectPaySettingModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.projectAbout.paySetting;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/paySetting/ProjectPaySettingParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.projectAbout.paySetting;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/OrganizationController.java

@@ -40,6 +40,7 @@ public class OrganizationController {
         return this.organizationService.saveProjectInfo(param);
     }
 
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @Operation(summary = "项目列表-分页查询", description = "项目列表-分页查询")

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/RoleController.java

@@ -35,9 +35,6 @@ public class RoleController {
     @Autowired
     RoleServiceImpl roleService;
 
-    @ResourceAuth(value = "roleSave", type = AuthType.Platform, remark = "角色管理_添加编辑角色_2_Button")
-    @ResourceAuth(value = "roleSave", type = AuthType.Project, remark = "角色管理_添加编辑角色_2_Button")
-    @ResourceAuth(value = "roleSave", type = AuthType.School, remark = "角色管理_添加编辑角色_2_Button")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -48,9 +45,6 @@ public class RoleController {
         return this.roleService.addRole(param);
     }
 
-    @ResourceAuth(value = "roleList", type = AuthType.Platform, remark = "角色管理_角色列表_1_Menu")
-    @ResourceAuth(value = "roleList", type = AuthType.Project, remark = "角色管理_角色列表_1_Menu")
-    @ResourceAuth(value = "roleList", type = AuthType.School, remark = "角色管理_角色列表_1_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -72,9 +66,9 @@ public class RoleController {
         return roleService.page(param, pageable);
     }
 
-    @ResourceAuth(value = "roleDelete", type = AuthType.Platform, remark = "角色管理_删除角色_3_Button")
-    @ResourceAuth(value = "roleDelete", type = AuthType.Project, remark = "角色管理_删除角色_3_Button")
-    @ResourceAuth(value = "roleDelete", type = AuthType.School, remark = "角色管理_删除角色_3_Button")
+//    @ResourceAuth(value = "roleDelete", type = AuthType.Platform, remark = "角色管理_删除角色_3_Button")
+//    @ResourceAuth(value = "roleDelete", type = AuthType.Project, remark = "角色管理_删除角色_3_Button")
+//    @ResourceAuth(value = "roleDelete", type = AuthType.School, remark = "角色管理_删除角色_3_Button")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -85,9 +79,6 @@ public class RoleController {
         return this.roleService.deleteRole(param.getId());
     }
 
-    @ResourceAuth(value = "roleDetail", type = AuthType.Platform, remark = "角色管理_角色详情_4_Button")
-    @ResourceAuth(value = "roleDetail", type = AuthType.Project, remark = "角色管理_角色详情_4_Button")
-    @ResourceAuth(value = "roleDetail", type = AuthType.School, remark = "角色管理_角色详情_4_Button")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/tempMenus/OrgMenuController.java

@@ -0,0 +1,355 @@
+package com.zhongshu.card.server.core.controller.tempMenus;
+
+import com.github.microservice.auth.client.constant.AuthConstant;
+import com.github.microservice.auth.security.annotations.ResourceAuth;
+import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.net.ResultContent;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("orgMenu")
+@Tag(name = "机构的菜单配置")
+@Hidden
+public class OrgMenuController {
+
+    @ResourceAuth(value = "orgBaseManager", type = AuthType.Project, remark = "项目配置_基本信息_0_Menu")
+    @ResourceAuth(value = "orgBaseManager", type = AuthType.School, remark = "项目配置_基本信息_0_Menu")
+    @ResourceAuth(value = "orgBaseManager", type = AuthType.BusinessMain, remark = "项目配置_基本信息_0_Menu")
+    @ResourceAuth(value = "orgBaseManager", type = AuthType.CommonOrg, remark = "项目配置_基本信息_0_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgBaseManager", method = {RequestMethod.GET})
+    public ResultContent orgBaseManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgPayManager", type = AuthType.Project, remark = "项目配置_支付配置_1_Menu")
+    @ResourceAuth(value = "orgPayManager", type = AuthType.School, remark = "项目配置_支付配置_1_Menu")
+    @ResourceAuth(value = "orgPayManager", type = AuthType.BusinessMain, remark = "项目配置_支付配置_1_Menu")
+    @ResourceAuth(value = "orgPayManager", type = AuthType.CommonOrg, remark = "项目配置_支付配置_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgPayManager", method = {RequestMethod.GET})
+    public ResultContent orgPayManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgWechatSettingManager", type = AuthType.Project, remark = "项目配置_小程序配置_2_Menu")
+    @ResourceAuth(value = "orgWechatSettingManager", type = AuthType.School, remark = "项目配置_小程序配置_2_Menu")
+    @ResourceAuth(value = "orgWechatSettingManager", type = AuthType.BusinessMain, remark = "项目配置_小程序配置_2_Menu")
+    @ResourceAuth(value = "orgWechatSettingManager", type = AuthType.CommonOrg, remark = "项目配置_小程序配置_2_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgWechatSettingManager", method = {RequestMethod.GET})
+    public ResultContent orgWechatSettingManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgAccessKeyManager", type = AuthType.Project, remark = "项目配置_AccessKey配置_3_Menu")
+    @ResourceAuth(value = "orgAccessKeyManager", type = AuthType.School, remark = "项目配置_AccessKey配置_3_Menu")
+    @ResourceAuth(value = "orgAccessKeyManager", type = AuthType.BusinessMain, remark = "项目配置_AccessKey配置_3_Menu")
+    @ResourceAuth(value = "orgAccessKeyManager", type = AuthType.CommonOrg, remark = "项目配置_AccessKey配置_3_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgAccessKeyManager", method = {RequestMethod.GET})
+    public ResultContent orgAccessKeyManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgTemplateManager", type = AuthType.Project, remark = "项目配置_模版配置_4_Menu")
+    @ResourceAuth(value = "orgTemplateManager", type = AuthType.School, remark = "项目配置_模版配置_4_Menu")
+    @ResourceAuth(value = "orgTemplateManager", type = AuthType.BusinessMain, remark = "项目配置_模版配置_4_Menu")
+    @ResourceAuth(value = "orgTemplateManager", type = AuthType.CommonOrg, remark = "项目配置_模版配置_4_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgTemplateManager", method = {RequestMethod.GET})
+    public ResultContent orgTemplateManager() {
+        return ResultContent.buildSuccess();
+    }
+
+
+    @ResourceAuth(value = "orgProtocolManager", type = AuthType.Project, remark = "项目配置_协议配置_5_Menu")
+    @ResourceAuth(value = "orgProtocolManager", type = AuthType.School, remark = "项目配置_协议配置_5_Menu")
+    @ResourceAuth(value = "orgProtocolManager", type = AuthType.BusinessMain, remark = "项目配置_协议配置_5_Menu")
+    @ResourceAuth(value = "orgProtocolManager", type = AuthType.CommonOrg, remark = "项目配置_协议配置_5_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgProtocolManager", method = {RequestMethod.GET})
+    public ResultContent orgProtocolManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgCommonSettingManager", type = AuthType.Project, remark = "项目配置_通用配置_6_Menu")
+    @ResourceAuth(value = "orgCommonSettingManager", type = AuthType.School, remark = "项目配置_通用配置_6_Menu")
+    @ResourceAuth(value = "orgCommonSettingManager", type = AuthType.BusinessMain, remark = "项目配置_通用配置_6_Menu")
+    @ResourceAuth(value = "orgCommonSettingManager", type = AuthType.CommonOrg, remark = "项目配置_通用配置_6_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgCommonSettingManager", method = {RequestMethod.GET})
+    public ResultContent orgCommonSettingManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgOrgManager", type = AuthType.Project, remark = "机构管理_机构列表_1_Menu")
+    @ResourceAuth(value = "orgOrgManager", type = AuthType.School, remark = "机构管理_机构列表_1_Menu")
+    @ResourceAuth(value = "orgOrgManager", type = AuthType.BusinessMain, remark = "机构管理_机构列表_1_Menu")
+    @ResourceAuth(value = "orgOrgManager", type = AuthType.CommonOrg, remark = "机构管理_机构列表_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgOrgManager", method = {RequestMethod.GET})
+    public ResultContent orgOrgManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgAreaManager", type = AuthType.Project, remark = "区域管理_区域列表_1_Menu")
+    @ResourceAuth(value = "orgAreaManager", type = AuthType.School, remark = "区域管理_区域列表_1_Menu")
+    @ResourceAuth(value = "orgAreaManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_1_Menu")
+    @ResourceAuth(value = "orgAreaManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgAreaManager", method = {RequestMethod.GET})
+    public ResultContent orgAreaManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgUserManager", type = AuthType.Project, remark = "用户管理_用户列表_1_Menu")
+    @ResourceAuth(value = "orgUserManager", type = AuthType.School, remark = "用户管理_用户列表_1_Menu")
+    @ResourceAuth(value = "orgUserManager", type = AuthType.BusinessMain, remark = "用户管理_用户列表_1_Menu")
+    @ResourceAuth(value = "orgUserManager", type = AuthType.CommonOrg, remark = "用户管理_用户列表_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgUserManager", method = {RequestMethod.GET})
+    public ResultContent orgUserManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgUserGroupManager", type = AuthType.Project, remark = "用户管理_用户分组_2_Menu")
+    @ResourceAuth(value = "orgUserGroupManager", type = AuthType.School, remark = "用户管理_用户分组_2_Menu")
+    @ResourceAuth(value = "orgUserGroupManager", type = AuthType.BusinessMain, remark = "用户管理_用户分组_2_Menu")
+    @ResourceAuth(value = "orgUserGroupManager", type = AuthType.CommonOrg, remark = "用户管理_用户分组_2_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgUserGroupManager", method = {RequestMethod.GET})
+    public ResultContent orgUserGroupManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgPosManager", type = AuthType.Project, remark = "用户管理_职位管理_3_Menu")
+    @ResourceAuth(value = "orgPosManager", type = AuthType.School, remark = "用户管理_职位管理_3_Menu")
+    @ResourceAuth(value = "orgPosManager", type = AuthType.BusinessMain, remark = "用户管理_职位管理_3_Menu")
+    @ResourceAuth(value = "orgPosManager", type = AuthType.CommonOrg, remark = "用户管理_职位管理_3_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgPosManager", method = {RequestMethod.GET})
+    public ResultContent orgPosManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgRoleManager", type = AuthType.Project, remark = "用户管理_角色列表_4_Menu")
+    @ResourceAuth(value = "orgRoleManager", type = AuthType.School, remark = "用户管理_角色列表_4_Menu")
+    @ResourceAuth(value = "orgRoleManager", type = AuthType.BusinessMain, remark = "用户管理_角色列表_4_Menu")
+    @ResourceAuth(value = "orgRoleManager", type = AuthType.CommonOrg, remark = "用户管理_角色列表_4_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgRoleManager", method = {RequestMethod.GET})
+    public ResultContent orgRoleManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgCardManager", type = AuthType.Project, remark = "卡片管理_卡片列表_1_Menu")
+    @ResourceAuth(value = "orgCardManager", type = AuthType.School, remark = "卡片管理_卡片列表_1_Menu")
+    @ResourceAuth(value = "orgCardManager", type = AuthType.BusinessMain, remark = "卡片管理_卡片列表_1_Menu")
+    @ResourceAuth(value = "orgCardManager", type = AuthType.CommonOrg, remark = "卡片管理_卡片列表_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgCardManager", method = {RequestMethod.GET})
+    public ResultContent orgCardManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgCardPoolManager", type = AuthType.Project, remark = "卡片管理_卡片资源库_2_Menu")
+    @ResourceAuth(value = "orgCardPoolManager", type = AuthType.School, remark = "卡片管理_卡片资源库_2_Menu")
+    @ResourceAuth(value = "orgCardPoolManager", type = AuthType.BusinessMain, remark = "卡片管理_卡片资源库_2_Menu")
+    @ResourceAuth(value = "orgCardPoolManager", type = AuthType.CommonOrg, remark = "卡片管理_卡片资源库_2_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgCardPoolManager", method = {RequestMethod.GET})
+    public ResultContent orgCardPoolManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgDeviceManager", type = AuthType.Project, remark = "设备管理_设备列表_1_Menu")
+    @ResourceAuth(value = "orgDeviceManager", type = AuthType.School, remark = "设备管理_设备列表_1_Menu")
+    @ResourceAuth(value = "orgDeviceManager", type = AuthType.BusinessMain, remark = "设备管理_设备列表_1_Menu")
+    @ResourceAuth(value = "orgDeviceManager", type = AuthType.CommonOrg, remark = "设备管理_设备列表_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgDeviceManager", method = {RequestMethod.GET})
+    public ResultContent orgDeviceManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgDeviceGroupManager", type = AuthType.Project, remark = "设备管理_设备分组_2_Menu")
+    @ResourceAuth(value = "orgDeviceGroupManager", type = AuthType.School, remark = "设备管理_设备分组_2_Menu")
+    @ResourceAuth(value = "orgDeviceGroupManager", type = AuthType.BusinessMain, remark = "设备管理_设备分组_2_Menu")
+    @ResourceAuth(value = "orgDeviceGroupManager", type = AuthType.CommonOrg, remark = "设备管理_设备分组_2_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgDeviceGroupManager", method = {RequestMethod.GET})
+    public ResultContent orgDeviceGroupManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgDevicePermissManager", type = AuthType.Project, remark = "设备管理_设备权限_3_Menu")
+    @ResourceAuth(value = "orgDevicePermissManager", type = AuthType.School, remark = "设备管理_设备权限_3_Menu")
+    @ResourceAuth(value = "orgDevicePermissManager", type = AuthType.BusinessMain, remark = "设备管理_设备权限_3_Menu")
+    @ResourceAuth(value = "orgDevicePermissManager", type = AuthType.CommonOrg, remark = "设备管理_设备权限_3_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgDevicePermissManager", method = {RequestMethod.GET})
+    public ResultContent orgDevicePermissManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgFundManager", type = AuthType.Project, remark = "资金管理_资金概况_1_Menu")
+    @ResourceAuth(value = "orgFundManager", type = AuthType.School, remark = "资金管理_资金概况_1_Menu")
+    @ResourceAuth(value = "orgFundManager", type = AuthType.BusinessMain, remark = "资金管理_资金概况_1_Menu")
+    @ResourceAuth(value = "orgFundManager", type = AuthType.CommonOrg, remark = "资金管理_资金概况_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgFundManager", method = {RequestMethod.GET})
+    public ResultContent orgFundManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "orgFundOrderManager", type = AuthType.Project, remark = "资金管理_支付订单_2_Menu")
+    @ResourceAuth(value = "orgFundOrderManager", type = AuthType.School, remark = "资金管理_支付订单_2_Menu")
+    @ResourceAuth(value = "orgFundOrderManager", type = AuthType.BusinessMain, remark = "资金管理_支付订单_2_Menu")
+    @ResourceAuth(value = "orgFundOrderManager", type = AuthType.CommonOrg, remark = "资金管理_支付订单_2_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgFundOrderManager", method = {RequestMethod.GET})
+    public ResultContent orgFundOrderManager() {
+        return ResultContent.buildSuccess();
+    }
+
+
+    @ResourceAuth(value = "orgFundSeparateManager", type = AuthType.Project, remark = "资金管理_分账单_3_Menu")
+    @ResourceAuth(value = "orgFundSeparateManager", type = AuthType.School, remark = "资金管理_分账单_3_Menu")
+    @ResourceAuth(value = "orgFundSeparateManager", type = AuthType.BusinessMain, remark = "资金管理_分账单_3_Menu")
+    @ResourceAuth(value = "orgFundSeparateManager", type = AuthType.CommonOrg, remark = "资金管理_分账单_3_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgFundSeparateManager", method = {RequestMethod.GET})
+    public ResultContent orgFundSeparateManager() {
+        return ResultContent.buildSuccess();
+    }
+
+
+    @ResourceAuth(value = "orgFundReconciliationManager", type = AuthType.Project, remark = "资金管理_对账单_4_Menu")
+    @ResourceAuth(value = "orgFundReconciliationManager", type = AuthType.School, remark = "资金管理_对账单_4_Menu")
+    @ResourceAuth(value = "orgFundReconciliationManager", type = AuthType.BusinessMain, remark = "资金管理_对账单_4_Menu")
+    @ResourceAuth(value = "orgFundReconciliationManager", type = AuthType.CommonOrg, remark = "资金管理_对账单_4_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "orgFundReconciliationManager", method = {RequestMethod.GET})
+    public ResultContent orgFundReconciliationManager() {
+        return ResultContent.buildSuccess();
+    }
+
+
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/tempMenus/PlatformMenuController.java

@@ -0,0 +1,86 @@
+package com.zhongshu.card.server.core.controller.tempMenus;
+
+import com.github.microservice.auth.client.constant.AuthConstant;
+import com.github.microservice.auth.security.annotations.ResourceAuth;
+import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.server.core.service.TestService;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("platMenu")
+@Tag(name = "平台的菜单配置")
+@Hidden
+public class PlatformMenuController {
+
+    @ResourceAuth(value = "platMainManager", type = AuthType.Platform, remark = "主控台_主控台_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "platMainManager", method = {RequestMethod.GET})
+    public ResultContent platMainManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "platProjectManager", type = AuthType.Platform, remark = "园区项目管理_园区管理_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "platProjectManager", method = {RequestMethod.GET})
+    public ResultContent platProjectManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "platOrgManager", type = AuthType.Platform, remark = "机构管理_机构列表_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "platOrgManager", method = {RequestMethod.GET})
+    public ResultContent platOrgManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "platUserManager", type = AuthType.Platform, remark = "用户管理_用户列表_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "platUserManager", method = {RequestMethod.GET})
+    public ResultContent platUserManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "platRoleManager", type = AuthType.Platform, remark = "权限管理_角色权限_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "platRoleManager", method = {RequestMethod.GET})
+    public ResultContent platRoleManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "platMenuManager", type = AuthType.Platform, remark = "权限管理_菜单权限_2_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "platMenuManager", method = {RequestMethod.GET})
+    public ResultContent platMenuManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "platPayManager", type = AuthType.Platform, remark = "支付管理_支付管理_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "platPayManager", method = {RequestMethod.GET})
+    public ResultContent platPayManager() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "platSettingManager", type = AuthType.Platform, remark = "系统设置_系统设置_1_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "platSettingManager", method = {RequestMethod.GET})
+    public ResultContent platSettingManager() {
+        return ResultContent.buildSuccess();
+    }
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -1,8 +1,8 @@
 package com.zhongshu.card.server.core.domain.payment;
 
 import com.github.microservice.models.type.OrderFromType;
-import com.github.microservice.models.type.PaymentDeviceType;
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentDeviceType;
+import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.types.OrderModeType;
 import com.github.microservice.types.OrderState;
 import com.zhongshu.card.client.type.RefundState;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/PayChannelConfig.java

@@ -0,0 +1,19 @@
+package com.zhongshu.card.server.core.domain.projectAbout;
+
+import com.github.microservice.types.payment.PaymentChannelType;
+import com.github.microservice.types.payment.PaymentType;
+import com.zhongshu.card.server.core.domain.base.SuperMain;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * 项目的  支付渠道总设置
+ *
+ * @author TRX
+ * @date 2024/9/27
+ */
+public class PayChannelConfig extends SuperMain {
+
+    @Schema(description = "")
+    private PaymentChannelType paymentChannelType;
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/ProjectPaySetting.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.domain.projectAbout;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import io.swagger.v3.oas.annotations.media.Schema;

FullCardServer/src/main/java/com/zhongshu/card/server/core/model/payment/ExpendParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.model.payment;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.server.core.domain.school.CardInfo;
 import com.zhongshu.card.server.core.domain.org.DeviceInfo;
 import io.swagger.v3.oas.annotations.media.Schema;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/hxz/HxzService.java

@@ -4,7 +4,7 @@ import cn.hutool.json.JSONUtil;
 import com.github.microservice.models.hxz.*;
 import com.github.microservice.models.type.OrderFromType;
 import com.github.microservice.net.ResultContent;
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.server.core.dao.school.CardInfoDao;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dao.payment.ExpenseFlowDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/orgManager/OrganizationManagerServiceImpl.java

@@ -255,7 +255,7 @@ public class OrganizationManagerServiceImpl extends SuperService {
             aboutInfo.setOid(oid);
             aboutInfo.setAuthType(organization.getAuthType());
             AuthType authType = organization.getAuthType();
-
+            // todo
         } else {
             aboutInfo.setOid(oid);
         }
@@ -297,4 +297,14 @@ public class OrganizationManagerServiceImpl extends SuperService {
         }
         return model;
     }
+
+    public OrganizationRelationModel toRelationModel(Organization entity) {
+        OrganizationRelationModel model = null;
+        if (ObjectUtils.isNotEmpty(entity)) {
+            model = new OrganizationRelationModel();
+            BeanUtils.copyProperties(entity, model);
+        }
+        return model;
+    }
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/orgManager/ProjectBindOrgServiceImpl.java

@@ -17,6 +17,8 @@ import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.OrganizationRelation;
 import com.zhongshu.card.server.core.domain.projectAbout.PayShareList;
 import com.zhongshu.card.server.core.service.base.SuperService;
+import com.zhongshu.card.server.core.service.projectAbout.PayShareListService;
+import com.zhongshu.card.server.core.service.user.UserAccountServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -54,6 +56,12 @@ public class ProjectBindOrgServiceImpl extends SuperService {
     @Autowired
     private PayShareListDao payShareListDao;
 
+    @Autowired
+    private UserAccountServiceImpl userAccountService;
+
+    @Autowired
+    private PayShareListService payShareListService;
+
     /**
      * 项目绑定机构信息
      *
@@ -72,6 +80,7 @@ public class ProjectBindOrgServiceImpl extends SuperService {
             return ResultContent.buildFail(String.format("不属于项目类型：%s", projectOid));
         }
 
+        // 选择的结构信息
         Organization orgInfo = organizationDao.findTopByOid(orgOid);
         if (ObjectUtils.isEmpty(projectInfo)) {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, orgOid));
@@ -104,6 +113,9 @@ public class ProjectBindOrgServiceImpl extends SuperService {
         organizationRelation.setRelAuthType(orgInfo.getAuthType());
         organizationRelation.setRelationType(OrganizationRelationType.ProjectBindOrg);
 
+        organizationRelation.setAboutOid(projectInfo.getOid());
+        organizationRelation.setAboutAuthType(projectInfo.getAuthType());
+
         organizationRelationDao.save(organizationRelation);
 
         return ResultContent.buildSuccess();
@@ -228,7 +240,16 @@ public class ProjectBindOrgServiceImpl extends SuperService {
     public ProjectBindOrgModel toModel(OrganizationRelation entity) {
         ProjectBindOrgModel model = null;
         if (ObjectUtils.isNotEmpty(entity)) {
-
+            model = new ProjectBindOrgModel();
+            BeanUtils.copyProperties(entity, model);
+            // 负责人信息
+            model.setManagerUserList(userAccountService.toListSimpleModel(userAccountService.getUserAccounts(entity.getManagerUserIds())));
+            // 分账规则信息
+            model.setPayShareList(payShareListService.toModel(entity.getPayShareList()));
+            // 主机构信息，如：项目信息
+            model.setMainOrganization(organizationManagerService.toRelationModel(entity.getMainOrganization()));
+            // 绑定的机构信息，如：机构信息
+            model.setRelOrganization(organizationManagerService.toRelationModel(entity.getRelOrganization()));
         }
         return model;
     }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -9,8 +9,8 @@ import com.github.microservice.models.hxz.ConsumTransactionsResult;
 import com.github.microservice.models.hxz.QRCodeTransactionModel;
 import com.github.microservice.models.hxz.WxPayResult;
 import com.github.microservice.models.type.OrderFromType;
-import com.github.microservice.models.type.PaymentDeviceType;
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentDeviceType;
+import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.github.microservice.types.OrderModeType;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/PayShareListService.java

@@ -0,0 +1,34 @@
+package com.zhongshu.card.server.core.service.projectAbout;
+
+import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.model.projectAbout.PayShareListModel;
+import com.zhongshu.card.server.core.dao.projectAbout.PayShareListDao;
+import com.zhongshu.card.server.core.domain.projectAbout.PayShareList;
+import com.zhongshu.card.server.core.service.base.SuperService;
+import lombok.Data;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author TRX
+ * @date 2024/9/27
+ */
+@Data
+@Service
+public class PayShareListService extends SuperService {
+
+    @Autowired
+    private PayShareListDao payShareListDao;
+
+    public PayShareListModel toModel(PayShareList entity) {
+        PayShareListModel model = null;
+        if (ObjectUtils.isNotEmpty(entity)) {
+            model = new PayShareListModel();
+            BeanUtils.copyProperties(entity, model);
+        }
+        return model;
+    }
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/util/PaymentUtil.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.util;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;