Commit Graph

159 Commits

Author SHA1 Message Date
yys f7d40414c0 feat: 团队订单与管理端订单代码重构、合并 2026-04-23 14:43:03 +08:00
yys 9eb8514fdf feat: 团队后台 - 团队用户,增加下放、回收积分 2026-04-23 12:31:37 +08:00
yys ba675ce0e0 feat: 按策划需求改进管理后台 2026-04-23 11:11:08 +08:00
yys 63f251de66 fix:团队统计修改 2026-04-22 17:57:55 +08:00
yys d578280f82 Merge branch 'seedance_balance' of https://gitea.06zk.com/best_yunwei/ai_images into seedance_balance 2026-04-22 17:42:50 +08:00
yys 0a714b1322 fix:团队统计修改 2026-04-22 17:40:59 +08:00
old burden 24c6936dd0 Merge remote-tracking branch 'origin/seedance_balance' into seedance_balance 2026-04-22 14:50:59 +08:00
old burden 742310844d fix:样式修改 2026-04-22 14:50:39 +08:00
yys b1707c8d20 fix:团队统计修改 2026-04-22 13:01:36 +08:00
yys abbd589b82 fix: 解决、改进管理后台-管理端-订单记录 相关功能 2026-04-21 18:01:44 +08:00
yys fb38439543 fix: 解决、改进管理后台-管理端-团队管理 相关的功能 2026-04-21 17:33:19 +08:00
old burden 28e51137c5 fix:团队统计修改 2026-04-21 16:33:53 +08:00
old burden 7b4395761c fix:增加时间搜索 2026-04-21 16:26:45 +08:00
old burden e1a574d99e fix:充值订单和业务订单bug修复 2026-04-21 16:11:55 +08:00
old burden 8fcdb74507 fix:充值订单和业务订单bug修复 2026-04-21 15:57:35 +08:00
old burden 4800af812d fix:充值订单和业务订单bug修复 2026-04-21 15:38:53 +08:00
old burden fd2ed863b3 fix:充值订单和业务订单bug修复 2026-04-21 15:26:26 +08:00
old burden 181228bb59 fix:充值订单和业务订单bug修复 2026-04-21 15:09:17 +08:00
old burden bbcc14a395 Merge remote-tracking branch 'origin/seedance_balance' into seedance_balance
# Conflicts:
#	admin-ui/src/views/ai/record/index.vue
2026-04-21 14:59:44 +08:00
old burden 5c4c62d729 fix:充值订单和业务订单bug修复 2026-04-21 14:59:07 +08:00
old burden 0385ac9640 fix:充值订单和业务订单bug修复 2026-04-21 14:50:14 +08:00
yys 9ffe5c8152 fix: 解决发现的问题 2026-04-21 14:37:54 +08:00
yys 20a063d6aa fix: 解决合并问题 2026-04-21 11:05:13 +08:00
yys e516105893 Merge remote-tracking branch 'origin/seedance_balance' into seedance_balance
# Conflicts:
#	web-api/ruoyi-system/src/main/java/com/ruoyi/ai/mapper/AiUserMapper.java
#	web-api/ruoyi-system/src/main/resources/mapper/system/AiUserMapper.xml
2026-04-21 11:00:27 +08:00
yys 8d7cd70cfc feat: 火山配置从部门表独立出来,相关取值、缓存、保存重写逻辑 2026-04-21 10:59:03 +08:00
old burden 2498b4deed Merge remote-tracking branch 'origin/seedance_balance' into seedance_balance 2026-04-21 10:48:14 +08:00
old burden 589bb9c7c8 fix:团队上限人数 2026-04-21 10:47:50 +08:00
yys cb72d4edae feat: 调整AI用户、部门的界面显示 2026-04-21 10:17:25 +08:00
yys b2f1bc8439 Merge branch 'seedance_balance' of https://gitea.06zk.com/best_yunwei/ai_images into seedance_balance
# Conflicts:
#	web-api/ruoyi-system/src/main/java/com/ruoyi/ai/mapper/AiVideoReportDataMapper.java
2026-04-21 09:50:29 +08:00
yys 1a7205564d feat: 生成视频时记录统计表数据 2026-04-21 09:48:28 +08:00
old burden d1b27c42cd fix:操作列优化 2026-04-20 17:53:09 +08:00
old burden a3bc2e24da fix:新功能提交 子后台新增下放积分 2026-04-20 17:40:14 +08:00
old burden b3b54f14bc fix:新功能提交 2026-04-20 17:17:12 +08:00
old burden 56389e5154 fix:新功能提交 2026-04-20 17:14:01 +08:00
old burden 7177d7c404 fix:新功能提交 2026-04-20 17:10:16 +08:00
old burden 009886d9d8 Merge remote-tracking branch 'origin/seedance_balance' into seedance_balance 2026-04-20 16:55:32 +08:00
old burden 6600f4f1f9 fix:新功能提交 2026-04-20 16:55:10 +08:00
yys 690bc43a55 Merge branch 'seedance_balance' of https://gitea.06zk.com/best_yunwei/ai_images into seedance_balance 2026-04-20 16:48:14 +08:00
yys 4a55202d35 fix: 团队余额bug修复 2026-04-20 16:48:10 +08:00
old burden bfa30bb543 fix:新功能提交 2026-04-20 16:33:43 +08:00
old burden c7334ab7d9 fix:系统用户表实现通过部门关联ai_user 2026-04-20 16:28:27 +08:00
old burden f98ceb5785 fix:系统用户表实现通过部门关联ai_user 2026-04-20 16:28:17 +08:00
old burden e4292ee87d fix:客户端注册充值取消 2026-04-20 16:27:25 +08:00
yys 17d5e3a1c9 Merge branch 'seedance_balance' of https://gitea.06zk.com/best_yunwei/ai_images into seedance_balance 2026-04-20 16:14:05 +08:00
yys 1ae99ae660 feat: 代码、索引优化 2026-04-20 16:13:56 +08:00
old burden ddd2a60f7e Merge remote-tracking branch 'origin/seedance_balance' into seedance_balance 2026-04-20 15:59:40 +08:00
old burden 8be42f7a4f feat: sql内容提交 2026-04-20 15:59:17 +08:00
yys 460cbc2a38 feat: 部门管理 - 积分更正 2026-04-20 14:38:57 +08:00
yys db2052b9fd feat: AI用户 - 下放/回收积分,去掉设置余额功能。恢复AiDeptController 2026-04-20 11:55:32 +08:00
yys c92f531f1b feat: 部门余额变更 2026-04-17 17:47:25 +08:00