Commit Graph

  • 46714da87c fix: 恢复 lihui 2025-07-25 14:05:30 +0800
  • e45033dead Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-25 13:50:20 +0800
  • 012efdecaf fix: 工作台昨日充值人数 lihui 2025-07-25 13:50:03 +0800
  • 752c6f86dd fix: 恢复:权限不重新到页面 lihui 2025-07-25 13:38:13 +0800
  • ffa2084b46 success Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期 zry 2025-07-25 13:27:05 +0800
  • 0f3c0ae813 Merge remote-tracking branch 'origin/lihui/feature-20250711103624-金币二期' into lihui/feature-20250711103624-金币二期 lihui 2025-07-25 13:26:36 +0800
  • 41db2d7bde optimize zry 2025-07-25 13:25:48 +0800
  • d41c8a793f fix: 恢复:权限不重新到页面 lihui 2025-07-25 13:25:45 +0800
  • c3e672a8b3 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期 ZhangYong 2025-07-25 11:32:34 +0800
  • 6fe72dc01a 角色权限管理显示逻辑 ZhangYong 2025-07-25 11:31:04 +0800
  • aaf4be815a fix: 多次调用tree ,权限不重新到页面 lihui 2025-07-25 11:09:43 +0800
  • efd060a386 rolename repeat's modified zry 2025-07-24 18:09:53 +0800
  • 6513da6386 角色新增多子权限问题,角色名取空格 ZhangYong 2025-07-24 17:35:22 +0800
  • a466a74e36 环境文件 ZhangYong 2025-07-24 17:25:48 +0800
  • 069da35350 新增角色多子节点新增问题 ZhangYong 2025-07-24 17:22:06 +0800
  • 037b13674b password optimized zry 2025-07-24 16:38:41 +0800
  • 7ce01541a0 Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期 zry 2025-07-24 15:36:50 +0800
  • b3909004e1 optimize+fix-bug zry 2025-07-24 15:32:54 +0800
  • f424eac4f4 测试环境文件 ZhangYong 2025-07-24 15:22:35 +0800
  • 5b01528624 新增角色地区权限修改7.24 ZhangYong 2025-07-24 15:18:40 +0800
  • 8b1c278aef 新增角色地区权限修改7.24 ZhangYong 2025-07-24 15:07:47 +0800
  • d6b7f40b39 Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-24 14:28:52 +0800
  • 08156f5356 fix: 重复查询 lihui 2025-07-24 14:28:10 +0800
  • b1aa64fbb1 Merge branch 'milestone-20250711-金币前端二期' into zhangrenyuan/feature-20250714163943-金币前端二期 zry 2025-07-24 11:55:12 +0800
  • 66d0e55a2d 用户编辑界面展示问题 ZhangYong 2025-07-24 11:48:16 +0800
  • 02be226de2 Merge branch 'milestone-20250711-金币前端二期' into zhangrenyuan/feature-20250714163943-金币前端二期 zry 2025-07-24 11:47:06 +0800
  • 6ea67e1a54 用户编辑展示问题修复 ZhangYong 2025-07-24 11:39:07 +0800
  • 0d6503ca48 用户编辑展示问题修复 ZhangYong 2025-07-24 11:37:04 +0800
  • c1ea5357bc Merge branch 'milestone-20250711-金币前端二期' into zhangrenyuan/feature-20250714163943-金币前端二期 zry 2025-07-24 11:36:26 +0800
  • fb67754990 zry merge zry 2025-07-24 11:33:02 +0800
  • 53949e4d48 Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期 lihuilin 2025-07-24 11:09:02 +0800
  • 5f83ae7d33 ?? lihuilin 2025-07-24 11:08:48 +0800
  • 991c77f5dd 加个空格 lihui 2025-07-24 11:08:01 +0800
  • 69671ff1cf Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期 zry 2025-07-24 10:38:15 +0800
  • 0e4c143208 fix:换地区接口 lihui 2025-07-24 10:36:04 +0800
  • 0d8e1522f5 Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into zhangyong/feature-20250716164232-金币前端 ZhangYong 2025-07-24 10:22:16 +0800
  • c7c4b8ff06 hebing ZhangYong 2025-07-24 10:22:09 +0800
  • 772b2b0746 success Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期 zry 2025-07-24 10:03:39 +0800
  • 5a21fb1b36 fix:7.24 凌晨发现的bug lihui 2025-07-24 09:59:52 +0800
  • 892e61fe5e merge zry 2025-07-24 01:49:13 +0800
  • 6a8f9bf20b merge zry 2025-07-24 01:42:55 +0800
  • ededd9bc62 Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期 zry 2025-07-24 01:28:55 +0800
  • 8973d90625 fix: 非管理员不显示权限管理 等bug lihui 2025-07-24 01:09:26 +0800
  • e2452bb5b9 Merge branch 'refs/heads/milestone-20250711-金币前端二期' into lihui/feature-20250711103624-金币二期 lihui 2025-07-24 00:18:16 +0800
  • b42cd120e2 本地修改 zry 2025-07-24 00:15:49 +0800
  • c2029686d1 角色管理权限控制 ZhangYong 2025-07-24 00:15:11 +0800
  • 9c12d21709 feat(permissions): 更新获取区域接口和参数 lihui 2025-07-23 23:42:11 +0800
  • 5a2393f476 refactor(permissions): 调整角色添加表单的字段顺序 lihui 2025-07-23 23:23:29 +0800
  • 67dd99e32b :Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期 zry 2025-07-23 22:51:54 +0800
  • d536d795bb edit role success zry 2025-07-23 22:50:43 +0800
  • 93d5b1aef0 Merge branch 'refs/heads/milestone-20250711-金币前端二期' into lihui/feature-20250711103624-金币二期 lihui 2025-07-23 20:07:37 +0800
  • db45faa90a fix:动态路由 lihui 2025-07-23 20:06:36 +0800
  • 90751e767f success merge zry 2025-07-23 19:00:02 +0800
  • dd912a86eb modified the problem of collecting all the node's id zry 2025-07-23 18:57:53 +0800
  • beb8bbe5ed 角色管理 ZhangYong 2025-07-23 18:55:44 +0800
  • ff24dde99b 角色管理 ZhangYong 2025-07-23 18:46:22 +0800
  • 77858e10d2 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期 ZhangYong 2025-07-23 17:18:28 +0800
  • 094dbe868f 新增角色地区权限 ZhangYong 2025-07-23 17:16:32 +0800
  • 21d408e152 success Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期 zry 2025-07-23 17:00:59 +0800
  • e4b4c40d5a little modified zry 2025-07-23 16:58:04 +0800
  • fdf2979319 表单校验 ZhangYong 2025-07-23 16:26:09 +0800
  • 007f3d7272 新增,编辑用户表单校验 ZhangYong 2025-07-23 16:18:02 +0800
  • b026f82e2c Merge branch 'refs/heads/milestone-20250711-金币前端二期' into lihui/feature-20250711103624-金币二期 lihui 2025-07-23 15:52:27 +0800
  • 5a901525a1 fix: 登录后直接跳到工作台问题 feat:抽菜单树方法 fix:工作台多数据 问题 lihui 2025-07-23 15:52:16 +0800
  • d0e8369395 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期 ZhangYong 2025-07-23 11:52:57 +0800
  • ea90b63bc0 编辑用户展示问题,新增角色排版问题 ZhangYong 2025-07-23 11:51:05 +0800
  • a0732d312d edit role permissions, display the permissions tree according to the superior role and check existing ones by default zry 2025-07-23 11:04:47 +0800
  • 0560bf2b2c update code merge zry 2025-07-23 09:34:15 +0800
  • e9c2939df2 update zry 2025-07-23 09:30:45 +0800
  • 3a98a978c8 新增角色地区bug ZhangYong 2025-07-22 18:08:57 +0800
  • 475e26c62e 合并 ZhangYong 2025-07-22 17:52:11 +0800
  • 6f3f0a992c 新增角色所属地 ZhangYong 2025-07-22 17:38:56 +0800
  • be6851256d second modified merge zry 2025-07-22 17:32:59 +0800
  • 6fe9a69971 merge success zry 2025-07-22 17:29:12 +0800
  • 2471e2395c fix: 冲突解决 lihui 2025-07-22 17:22:39 +0800
  • 97f3085ebe Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期 zry 2025-07-22 17:15:16 +0800
  • 40f8dc48a7 success merge zry 2025-07-22 17:13:22 +0800
  • 4e98616d6f 新增用户表单校验 ZhangYong 2025-07-22 17:12:40 +0800
  • 10de44896f 新增用户表单校验 ZhangYong 2025-07-22 17:10:12 +0800
  • 0bdd147102 edit role permissions zry 2025-07-22 17:07:46 +0800
  • 4775a78850 fix(usergold): 修复总数据请求成功时精网号不存在的问题 导致数据 为null 不清除 lihui 2025-07-22 16:48:22 +0800
  • e898fb7151 fix(permissions): 重置按钮 lihui 2025-07-22 16:24:16 +0800
  • 82695e9799 fix(consume): 将"消耗金额"改为"消耗总金额",数据为永久金币数 lihui 2025-07-22 16:16:11 +0800
  • 240f112f53 新增角色页面地区,权限列表单选,角色重复提示 ZhangYong 2025-07-22 16:04:08 +0800
  • b4e62a5d7a 新增角色功能 ZhangYong 2025-07-22 15:51:32 +0800
  • ce0947b015 Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-22 15:50:35 +0800
  • 68c650234d refactor(recharge): 注释冗余的用户验证逻辑 lihui 2025-07-22 15:50:25 +0800
  • 15e5dca807 Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-22 15:33:10 +0800
  • 377ba8fce2 feat(workspace): 优化工作台数据更新时间显示逻辑时间 lihui 2025-07-22 15:32:56 +0800
  • 8a6e50c6fd Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-22 14:59:29 +0800
  • 5eb8515431 feat(consume): 添加初始化金币,优化修改密码布局 lihui 2025-07-22 14:59:17 +0800
  • c843bf8af5 Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-22 13:15:10 +0800
  • e05bae5071 fix(permissions): 修复重置密码权限检查逻辑 lihui 2025-07-22 13:14:31 +0800
  • 1afdb5e59f Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-22 13:12:19 +0800
  • 9bba794626 fix(permissions): 修复重置密码权限检查逻辑 lihui 2025-07-22 13:11:58 +0800
  • 38978ff0fb Revert "fix(permissions): 修复重置密码权限检查逻辑" lihui 2025-07-22 13:06:05 +0800
  • d532ce1b63 fix(usergold): 修复免费金币计算方式 lihui 2025-07-22 13:05:53 +0800
  • 3e1a01cc78 fix(permissions): 修复重置密码权限检查逻辑 lihui 2025-07-22 13:01:25 +0800
  • 0b6992321f feat(permissions): 添加用户密码重置功能 lihui 2025-07-22 11:56:54 +0800
  • 51b08e3499 重置密码地区校验 ZhangYong 2025-07-22 11:23:03 +0800