Commit Graph

Select branches

Hide Pull Requests

dev

huangqizheng/feature-20250707173453-7.7bug修改

huangqizheng/feature-20250708175155-7.8bug修复

huangqizheng/feature-20250709163552-7.8导出传输对象修复

huangqizheng/feature-20250710151401-数据同步完成

huangqizheng/feature-20250714180618-数据同步

huangqizheng/feature-20250715100115-非测试数据筛选

huangqizheng/feature-20250717200321-优化导出

huangqizheng/feature-20250718222252-导出修改完毕

huangqizheng/feature-20250719105717-后端完毕

huangqizheng/feature-20250721170818-后端周末修改

huangqizheng/feature-20250722105318-BUG修改

huangqizheng/feature-20250725144236-精简日志

huangqizheng/feature-20250728134614-三期数据库配置

huangqizheng/feature-20250731164458-地区部分修改以及导出的封装

huangqizheng/feature-20250801114957-导出

huangqizheng/feature-20250801180134-消费导出

huangqizheng/feature-20250803175216-导出完毕

huangqizheng/feature-20250804114811-打包配置

huangqizheng/feature-20250805200446-配置修改及充值导出修改

huangqizheng/feature-20250806120055-修复BUG

huangqizheng/feature-20250808172612-bug修复

huangqizheng/feature-20250809103653-修改配置导出重新上传

huangqizheng/feature-20250809184038-研发部校验

huangqizheng/feature-20251104113536-现金管理二期退款修改

huangqizheng/feature-20251119150446-退款合并后

lihuilin/hotfix-20250810160509-余额地区传参

lihuilin/hotfix-20250815-审核默认更新时间

lihuilin1015备份

lijianlin/feature-20250623120104-工作台与审核

lijianlin/feature-20250710152503-二期工作台与部分权限

lijianlin/feature-20250728171217-三期金豆消费相关

lijianlin/feature-202509231533026-现金管理-收款管理

lijianlin/feature-20251104110749-现金管理二期

master

milestone-20250702-金币重构一期

milestone-20250711-金币重构二期

milestone-20250727-金币重构三期

milestone-20251016-现金管理

milestone-20251104-现金管理二期

sunjiabei/feature-20250623130922-消费功能

sunjiabei/feature-20250710132313-二期模块

sunjiabei/feature-20250725135225-金币三期

sunjiabei/feature-20250822111257-平台和商品id字段替换

sunjiabei/feature-20250924164720-现金管理

sunjiabei/feature-20251021102635-银行接口

wangyetao/feature-20250628170337-汇率

wangyetao/feature-20250715095107-地区数据权限

yufenghao/feature-20251106105659-现金管理接口优化

yufenghao1106

工作流配置

Mono Color

• 17f3a48fea Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250728171217-三期金豆消费相关' into milestone-20250727-金币重构三期 lijianlin 2025-07-31 16:37:11 +0800
• 6607411bb7 铁粉消费合计数 lijianlin 2025-07-31 16:36:43 +0800
• 88d0488a1b Merge branch 'milestone-20250727-金币重构三期' into sunjiabei/feature-20250725135225-金币三期 sunjiabei 2025-07-31 12:06:07 +0800
• 3ce7e1a727 7月31日系统充值与新增 sunjiabei 2025-07-31 12:05:36 +0800
• 91ed5a7eac 消费直播页面（列表+合计数） lijianlin 2025-07-31 11:01:42 +0800
• b9956c2db9 Merge branch 'milestone-20250727-金币重构三期' into sunjiabei/feature-20250725135225-金币三期 sunjiabei 2025-07-30 18:30:47 +0800
• 9d9d0faefa 7月30日系统充值 sunjiabei 2025-07-30 18:29:30 +0800
• 98e156370b 消费合计数（仅直播消耗） lijianlin 2025-07-30 18:29:13 +0800
• 090d0b54f1 Merge branch 'milestone-20250727-金币重构三期' into sunjiabei/feature-20250725135225-金币三期 sunjiabei 2025-07-30 15:06:48 +0800
• 9be131f870 7月30日暂存 sunjiabei 2025-07-30 15:06:18 +0800
• b36a5e25fc 7月30日新增金豆 sunjiabei 2025-07-30 14:58:19 +0800
• 0caa98808c Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250728171217-三期金豆消费相关' into milestone-20250727-金币重构三期 lijianlin 2025-07-30 13:10:42 +0800
• a95c19c926 直播消费实体类与获取用户分部 lijianlin 2025-07-30 13:10:08 +0800
• b9ffc6004d 删除垃圾文件 sunjiabei 2025-07-30 11:36:32 +0800
• b1cc600207 Merge branch 'milestone-20250727-金币重构三期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250727-金币重构三期 lihuilin 2025-07-30 11:25:23 +0800
• 00566d17cf 用户卡片和数据源配置 sunjiabei 2025-07-30 11:23:58 +0800
• f0ddbe6a35 Merge branch 'milestone-20250727-金币重构三期' into sunjiabei/feature-20250725135225-金币三期 sunjiabei 2025-07-30 11:03:07 +0800
• 78132d34bf 用户卡片 sunjiabei 2025-07-30 11:03:03 +0800
• bc8928c1da 金币目录整合 lijianlin 2025-07-29 17:42:33 +0800
• 776170d761 金豆目录初始化 sunjiabei 2025-07-29 16:57:40 +0800
• 591c5b7f26 金豆目录初始化 sunjiabei 2025-07-29 16:51:08 +0800
• 38dc238bef 金豆目录初始化 sunjiabei 2025-07-29 16:50:37 +0800
• f3eedd8644 金豆目录初始化 sunjiabei 2025-07-29 16:47:58 +0800
• 0443cef530 Merge branch 'milestone-20250727-金币重构三期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250727-金币重构三期 lihuilin 2025-07-29 11:33:52 +0800
• 0bc4bad11d 7.28数据库配置 huangqizheng/feature-20250728134614-三期数据库配置 huangqizhen 2025-07-28 13:46:44 +0800
• 4cac592e7e 7.27地区查询 milestone-20250711-金币重构二期 lijianlin/feature-20250710152503-二期工作台与部分权限 huangqizhen 2025-07-27 13:06:59 +0800
• ecba540c58 Merge branch 'refs/heads/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期 lijianlin 2025-07-25 16:04:58 +0800
• cb51e2f3a1 工作台、审核解耦合 lijianlin 2025-07-25 16:04:32 +0800
• ba69529653 Merge branch 'milestone-20250711-金币重构二期' into sunjiabei/feature-20250725135225-金币三期 sunjiabei 2025-07-25 15:01:16 +0800
• 88845925cd 解耦合 sunjiabei 2025-07-25 15:00:25 +0800
• 3ded8524c2 7.25日志精简 huangqizheng/feature-20250725144236-精简日志 huangqizhen 2025-07-25 14:43:14 +0800
• 13c4fcc17d 7.25更新项目相关信息md文件 sunjiabei/feature-20250710132313-二期模块 huangqizhen 2025-07-25 13:26:08 +0800
• 1917fd450d Merge remote-tracking branch 'refs/remotes/origin/huangqizheng/feature-20250722105318-BUG修改' into milestone-20250711-金币重构二期 huangqizhen 2025-07-25 13:14:35 +0800
• 8d4a9114e9 7.25同步修复时间问题 huangqizheng/feature-20250722105318-BUG修改 huangqizhen 2025-07-25 13:14:12 +0800
• 521cecf9c4 角色编辑校验 sunjiabei 2025-07-25 10:42:36 +0800
• 2658cf2290 权限树权限管理 sunjiabei 2025-07-25 10:28:52 +0800
• e4aaeaa128 权限树去掉权限管理 sunjiabei 2025-07-25 10:25:56 +0800
• b2532c33f7 角色新增校验 sunjiabei 2025-07-25 10:11:53 +0800
• 1ff583aef7 总部地区优化--去重 lijianlin 2025-07-24 18:05:36 +0800
• 9c39051ae4 角色编辑校验 sunjiabei 2025-07-24 18:04:19 +0800
• 3f02250840 角色名筛选校验 sunjiabei 2025-07-24 17:54:39 +0800
• e87e44108b 空格筛选 sunjiabei 2025-07-24 16:15:11 +0800
• 719ebef10f Merge remote-tracking branch 'origin/milestone-20250711-金币重构二期' into milestone-20250711-金币重构二期 lijianlin 2025-07-24 15:28:54 +0800
• f455296760 7.23修改同步 huangqizhen 2025-07-24 15:28:34 +0800
• c8236d20a3 退款审核--驳回bug修复 lijianlin 2025-07-24 15:28:32 +0800
• 4c13f04d0b Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期 lijianlin 2025-07-24 10:23:59 +0800
• 02ba787eca 定时任务优化 lijianlin 2025-07-24 10:21:14 +0800
• 1e2ad26b4e 角色地区 lijianlin 2025-07-24 00:15:26 +0800
• a2dd18226a 修改角色权限 sunjiabei 2025-07-23 22:47:29 +0800
• ea71d921cf 新增角色权限 sunjiabei 2025-07-23 22:36:27 +0800
• 90aacd3ebd 统计消耗改为证书 lijianlin 2025-07-23 19:16:10 +0800
• 75b6a68810 用户名称模糊查询 sunjiabei 2025-07-23 17:54:50 +0800
• b51367d0c6 获取用户地区优化：总部展示在最前方 lijianlin 2025-07-23 17:26:23 +0800
• 2c16bd0ed2 充值消费退款精网号查询优化 sunjiabei 2025-07-23 17:14:28 +0800
• 9ec25fd51c 角色时间排序 sunjiabei 2025-07-23 16:54:08 +0800
• a30945ca84 Merge branch 'milestone-20250711-金币重构二期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250711-金币重构二期 lihuilin 2025-07-23 16:35:24 +0800
• 23313119d7 Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期 lijianlin 2025-07-23 16:04:46 +0800
• 89d6fb3805 定时任务统计数据优化 lijianlin 2025-07-23 16:00:38 +0800
• 42b08aa688 Merge remote-tracking branch 'origin/milestone-20250711-金币重构二期' into milestone-20250711-金币重构二期 huangqizhen 2025-07-23 15:24:48 +0800
• 429290bac8 Merge branch 'refs/heads/huangqizheng/feature-20250722105318-BUG修改' into milestone-20250711-金币重构二期 huangqizhen 2025-07-23 14:10:55 +0800
• cae8c39e8c 7.23修改同步 huangqizhen 2025-07-23 14:10:10 +0800
• 089f036a2b 地区接口修改 lijianlin 2025-07-23 13:47:51 +0800
• 386ce06dde 工作台图表地区接口优化 lijianlin 2025-07-23 11:25:32 +0800
• fa8fa32499 地区工具类筛选 sunjiabei 2025-07-23 10:40:30 +0800
• 7492c903f4 用户查询权限校验 sunjiabei 2025-07-22 15:15:09 +0800
• 7a609619ba 地区 sunjiabei 2025-07-22 13:55:19 +0800
• db8f988e48 Merge remote-tracking branch 'origin/milestone-20250711-金币重构二期' into milestone-20250711-金币重构二期 sunjiabei 2025-07-22 11:05:32 +0800
• 9a1725d106 地区sql语句修复 sunjiabei 2025-07-22 11:04:54 +0800
• 91c135295c 7.22后端修改；历史消费 huangqizhen 2025-07-22 10:53:59 +0800
• 924f4357b8 地区恢复 sunjiabei 2025-07-22 10:44:01 +0800
• bd3534a716 卡片地区赛选 sunjiabei 2025-07-21 20:14:25 +0800
• b8749073bc 消耗统计 sunjiabei 2025-07-21 19:43:53 +0800
• 60576ab268 父角色校验 sunjiabei 2025-07-21 19:33:20 +0800
• 36fc02faef 父角色校验 sunjiabei 2025-07-21 19:22:11 +0800
• 772fdffa4c 角色地区查询 lijianlin 2025-07-21 18:47:13 +0800
• a7e43bb649 7.20后端修改 huangqizheng/feature-20250721170818-后端周末修改 huangqizhen 2025-07-21 17:08:29 +0800
• 18af0d9ff8 父角色校验 sunjiabei 2025-07-21 17:05:38 +0800
• 8a9c238d8f 角色名校验 sunjiabei 2025-07-21 16:02:27 +0800
• 638b72806b 筛选校验 sunjiabei 2025-07-21 14:54:53 +0800
• 28941c2963 Merge remote-tracking branch 'origin/milestone-20250711-金币重构二期' into milestone-20250711-金币重构二期 lijianlin 2025-07-21 14:34:06 +0800
• 16b43ee3d5 密码修改 sunjiabei 2025-07-21 14:32:56 +0800
• ec97552818 Merge branch 'milestone-20250711-金币重构二期' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20250710152503-二期工作台与部分权限 lijianlin 2025-07-21 14:32:36 +0800
• c6c08f402a bug修复-退款审核通过、用户地区权限、图表优化 lijianlin 2025-07-21 14:32:12 +0800
• c6a42e1421 优先级限制 sunjiabei 2025-07-21 13:32:32 +0800
• 9eabb4fcb4 无用户禁止删除 sunjiabei 2025-07-21 10:52:44 +0800
• 9b646b9f49 权限字段替换 sunjiabei 2025-07-19 13:47:46 +0800
• ad19d6f06a 获取用户权限信息bug修复 lijianlin 2025-07-19 12:04:54 +0800
• 307d38c503 退款审核bug修复 lijianlin 2025-07-19 11:30:27 +0800
• e5ad5f8367 Merge branch 'refs/heads/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期 lijianlin 2025-07-19 11:20:31 +0800
• 1730a4a97b 定时任务优化 lijianlin 2025-07-19 11:18:38 +0800
• 8d19f81ffb 7.19后端完毕 huangqizheng/feature-20250719105717-后端完毕 huangqizhen 2025-07-19 10:57:34 +0800
• 83e4cb66a8 父级角色信息展示，工作台逻辑优化 lijianlin 2025-07-19 09:53:37 +0800
• b320e00202 7.18导出修改完毕 huangqizheng/feature-20250718222252-导出修改完毕 huangqizhen 2025-07-18 22:23:21 +0800
• 6368800415 消费，退款，充值导出 sunjiabei 2025-07-18 19:31:48 +0800
• 8a0a187355 Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期 lijianlin 2025-07-18 17:37:23 +0800
• ba2a35547e 审核地区权限 lijianlin 2025-07-18 17:34:47 +0800
• 9f8524a2bc 角色查询地区权限筛选 sunjiabei 2025-07-18 17:02:16 +0800
• a845073aa9 角色查询地区权限筛选 sunjiabei 2025-07-18 11:30:02 +0800
• 51918355f9 字符 sunjiabei 2025-07-18 10:16:48 +0800
• dd143d234c 地区属性校验 sunjiabei 2025-07-18 10:06:04 +0800