 sunjiabei
|
a74e194152
|
8月2日充值审核接口补全
|
2 weeks ago |
lijianlin
|
6c159981a9
|
Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250728171217-三期金豆消费相关' into milestone-20250727-金币重构三期
# Conflicts:
# src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java
# src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java
# src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java
|
2 weeks ago |
|
lijianlin
|
6fc1a26eb3
|
直播消费重构
|
2 weeks ago |
huangqizhen
|
1d0b2bace1
|
8.1完成金豆消费导出
|
2 weeks ago |
|
sunjiabei
|
92c3c44b4b
|
8月1日充值审核接口补全
|
2 weeks ago |
|
sunjiabei
|
ef5fd9f170
|
8月1日充值审核接口修改
|
2 weeks ago |
|
sunjiabei
|
d756c9bfe0
|
Merge branch 'sunjiabei/feature-20250725135225-金币三期' into milestone-20250727-金币重构三期
# Conflicts:
# src/main/java/com/example/demo/domain/vo/coin/Page.java
|
2 weeks ago |
|
sunjiabei
|
7bafda6af8
|
8月1日充值审核接口
|
2 weeks ago |
|
lijianlin
|
ac12dbc730
|
Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250728171217-三期金豆消费相关' into milestone-20250727-金币重构三期
|
2 weeks ago |
|
lijianlin
|
2abd7a3179
|
客户金豆余额及合计数
|
2 weeks ago |
|
huangqizhen
|
6ec8e59080
|
7.30地区部分修改以及导出的封装
|
2 weeks ago |
|
sunjiabei
|
c39565c409
|
8月1日充值地区接口
|
2 weeks ago |
|
sunjiabei
|
92ce83c768
|
7月31日代码合并
|
2 weeks ago |
|
sunjiabei
|
1b9514be2f
|
Merge branch 'milestone-20250727-金币重构三期' into sunjiabei/feature-20250725135225-金币三期
|
2 weeks ago |
|
sunjiabei
|
df23d7058b
|
7月31日线上充值与与金币统计
|
2 weeks ago |
|
lijianlin
|
1e39013157
|
Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250728171217-三期金豆消费相关' into milestone-20250727-金币重构三期
# Conflicts:
# src/main/java/com/example/demo/controller/bean/BeanRechargeController.java
|
2 weeks ago |
|
lijianlin
|
7949151ab6
|
文章消费记录与合计数，BeanPage转移至Page
|
2 weeks ago |
|
sunjiabei
|
0e5dfe0fc2
|
7月31日系统充值与与金币统计
|
2 weeks ago |
|
huangqizhen
|
c2f590d6c4
|
7.30地区部分修改以及导出的封装
|
2 weeks ago |
|
lijianlin
|
17f3a48fea
|
Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250728171217-三期金豆消费相关' into milestone-20250727-金币重构三期
|
3 weeks ago |
|
lijianlin
|
6607411bb7
|
铁粉消费合计数
|
3 weeks ago |
|
sunjiabei
|
88d0488a1b
|
Merge branch 'milestone-20250727-金币重构三期' into sunjiabei/feature-20250725135225-金币三期
|
3 weeks ago |
|
sunjiabei
|
3ce7e1a727
|
7月31日系统充值与新增
|
3 weeks ago |
|
lijianlin
|
91ed5a7eac
|
消费直播页面（列表+合计数）
|
3 weeks ago |
|
sunjiabei
|
b9956c2db9
|
Merge branch 'milestone-20250727-金币重构三期' into sunjiabei/feature-20250725135225-金币三期
# Conflicts:
# src/main/java/com/example/demo/domain/vo/bean/BeanPage.java
|
3 weeks ago |
|
sunjiabei
|
9d9d0faefa
|
7月30日系统充值
|
3 weeks ago |
|
lijianlin
|
98e156370b
|
消费合计数（仅直播消耗）
|
3 weeks ago |
|
sunjiabei
|
090d0b54f1
|
Merge branch 'milestone-20250727-金币重构三期' into sunjiabei/feature-20250725135225-金币三期
|
3 weeks ago |
|
sunjiabei
|
9be131f870
|
7月30日暂存
|
3 weeks ago |
|
sunjiabei
|
b36a5e25fc
|
7月30日新增金豆
|
3 weeks ago |
|
lijianlin
|
0caa98808c
|
Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250728171217-三期金豆消费相关' into milestone-20250727-金币重构三期
|
3 weeks ago |
|
lijianlin
|
a95c19c926
|
直播消费实体类与获取用户分部
|
3 weeks ago |
|
sunjiabei
|
b9ffc6004d
|
删除垃圾文件
|
3 weeks ago |
|
sunjiabei
|
00566d17cf
|
用户卡片和数据源配置
|
3 weeks ago |
|
sunjiabei
|
f0ddbe6a35
|
Merge branch 'milestone-20250727-金币重构三期' into sunjiabei/feature-20250725135225-金币三期
|
3 weeks ago |
|
sunjiabei
|
78132d34bf
|
用户卡片
|
3 weeks ago |
|
lijianlin
|
bc8928c1da
|
金币目录整合
|
3 weeks ago |
|
sunjiabei
|
776170d761
|
金豆目录初始化
|
3 weeks ago |
|
sunjiabei
|
591c5b7f26
|
金豆目录初始化
|
3 weeks ago |
|
sunjiabei
|
38dc238bef
|
金豆目录初始化
|
3 weeks ago |
|
sunjiabei
|
f3eedd8644
|
金豆目录初始化
|
3 weeks ago |
|
huangqizhen
|
0bc4bad11d
|
7.28数据库配置
|
3 weeks ago |
|
huangqizhen
|
4cac592e7e
|
7.27地区查询
|
3 weeks ago |
|
lijianlin
|
ecba540c58
|
Merge branch 'refs/heads/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期
|
3 weeks ago |
|
lijianlin
|
cb51e2f3a1
|
工作台、审核解耦合
|
3 weeks ago |
|
sunjiabei
|
ba69529653
|
Merge branch 'milestone-20250711-金币重构二期' into sunjiabei/feature-20250725135225-金币三期
|
3 weeks ago |
|
sunjiabei
|
88845925cd
|
解耦合
|
3 weeks ago |
|
huangqizhen
|
3ded8524c2
|
7.25日志精简
|
3 weeks ago |
|
huangqizhen
|
13c4fcc17d
|
7.25更新项目相关信息md文件
|
3 weeks ago |
|
huangqizhen
|
1917fd450d
|
Merge remote-tracking branch 'refs/remotes/origin/huangqizheng/feature-20250722105318-BUG修改' into milestone-20250711-金币重构二期
|
3 weeks ago |
