jianlin
|
82f01e50dc
|
Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20250623120104-工作台与审核
|
1 day ago |
|
jianlin
|
8c7605fe82
|
7-3aop
|
1 day ago |
huangqizhen
|
e1d6a2dc11
|
7.2登录及相关配置
|
2 days ago |
|
jianlin
|
ac90b933bb
|
Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期
|
2 days ago |
|
jianlin
|
668e39a252
|
7-2审核统计数，工统计表存储优化
|
2 days ago |
|
huangqizhen
|
60bf3424c8
|
7.2汇率合并
|
3 days ago |
 sunjiabei
|
5206832e34
|
退款逻辑
|
3 days ago |
|
jianlin
|
c7cebb823c
|
Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期
|
3 days ago |
|
jianlin
|
05cf4c5983
|
7-1审核统计数，工作台优化
|
3 days ago |
|
huangqizhen
|
d884849dc4
|
Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期
|
3 days ago |
|
huangqizhen
|
dc95d625e6
|
可跑（不合并）
|
3 days ago |
|
sunjiabei
|
ba19635520
|
退款逻辑
|
3 days ago |
|
sunjiabei
|
8bc41b60d6
|
楼上接口+商品查询修改
|
3 days ago |
|
jianlin
|
bbed22916d
|
Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期
# Conflicts:
# src/main/java/com/example/demo/domain/vo/Page.java
|
4 days ago |
|
jianlin
|
04b61d2687
|
6-30审核相关接口（缺统计数据）
|
4 days ago |
|
sunjiabei
|
f4f7406fc6
|
楼上接口+商品查询修改
|
4 days ago |
|
huangqizhen
|
e56cb9744f
|
可跑（不合并）
|
4 days ago |
|
sunjiabei
|
979abbd622
|
楼上接口+商品查询修改
|
4 days ago |
|
huangqizhen
|
6bb3f5a45d
|
权限
|
4 days ago |
|
sunjiabei
|
77e0a6e31f
|
新增退款及附属接口
|
4 days ago |
|
sunjiabei
|
056c957f75
|
新增充值和活动查询
|
5 days ago |
|
sunjiabei
|
cb5e5687f5
|
充值详情
|
5 days ago |
|
sunjiabei
|
22171610c6
|
排序修改
|
6 days ago |
|
sunjiabei
|
78af78ec42
|
Merge branch 'milestone-20250702-金币重构一期' into sunjiabei/feature-20250623130922-消费功能
|
6 days ago |
|
huangqizhen
|
31d62c576c
|
6.26 查询接口修复
|
7 days ago |
|
jianlin
|
f09eb9bc92
|
Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期
|
1 week ago |
|
jianlin
|
98bb1296e1
|
6-27工作台卡片及图表数据（缺图表统计）
|
1 week ago |
|
sunjiabei
|
407e01397d
|
Merge branch 'milestone-20250702-金币重构一期' into sunjiabei/feature-20250623130922-消费功能
|
1 week ago |
|
sunjiabei
|
88c6492230
|
bug修改
|
1 week ago |
|
sunjiabei
|
786d281c0e
|
测试git
|
1 week ago |
|
sunjiabei
|
637be279e9
|
退款接口
|
1 week ago |
|
sunjiabei
|
18e3c4521e
|
修改bug
|
1 week ago |
|
sunjiabei
|
fd6ecaf537
|
新增消耗修改和退款框架
|
1 week ago |
|
sunjiabei
|
e8921ddca0
|
新增消耗金币校验
|
1 week ago |
|
sunjiabei
|
339410fc7c
|
新增消耗
|
1 week ago |
|
sunjiabei
|
2ed53a5326
|
消耗更正以及用户卡片信息
|
1 week ago |
|
sunjiabei
|
c61f9f6eaf
|
用户信息
|
1 week ago |
|
huangqizhen
|
58f24b11fd
|
Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期
|
1 week ago |
|
huangqizhen
|
ceb65f8110
|
6.24 合并冲突部分修复
|
1 week ago |
|
jianlin
|
67508049dc
|
Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期
# Conflicts:
# src/main/java/com/example/demo/service/GeneralService.java
# src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
|
1 week ago |
|
huangqizhen
|
ed6ef8996e
|
Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期
# Conflicts:
# src/main/java/com/example/demo/domain/vo/Page.java
|
1 week ago |
|
huangqizhen
|
cdd1c51dbd
|
Merge remote-tracking branch 'refs/remotes/origin/huangqizheng/feature-20250623110001-客户金币明细' into milestone-20250702-金币重构一期
|
1 week ago |
|
jianlin
|
a4c8cb6875
|
Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期
|
1 week ago |
|
huangqizhen
|
3dcdb9f7b5
|
6.24 客户金币余额，异步部分
|
1 week ago |
|
jianlin
|
5496460df7
|
6-24更新统计数据part2(余量外属性)
|
1 week ago |
|
sunjiabei
|
9ad7f3af69
|
消费模块，筛选查询详情
|
1 week ago |
|
sunjiabei
|
99a0b0f800
|
消费模块，消费详情分页，商品查询
|
2 weeks ago |
|
sunjiabei
|
0341bc2ab3
|
Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期
|
2 weeks ago |
|
huangqizhen
|
f827e86e7a
|
Merge branch 'refs/heads/huangqizheng/feature-20250623110001-客户金币明细' into milestone-20250702-金币重构一期
|
2 weeks ago |
|
huangqizhen
|
e885ab526a
|
6.23 客户金币明细页面查询与合计
|
2 weeks ago |
