 sunjiabei
|
fe97a393aa
|
Merge branch 'milestone-20250711-金币重构二期' into sunjiabei/feature-20250710132313-二期模块
|
9 months ago |
|
sunjiabei
|
d31de78076
|
Merge branch 'milestone-20250711-金币重构二期' into sunjiabei/feature-20250710132313-二期模块
# Conflicts:
# src/main/java/com/example/demo/controller/AdminController.java
# src/main/java/com/example/demo/mapper/GeneralMapper.java
# src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
|
9 months ago |
huangqizhen
|
507f7090a4
|
7.15筛选非测试数据
|
9 months ago |
|
sunjiabei
|
0f15490913
|
二期任务合并
|
9 months ago |
lijianlin
|
c0ec4a480f
|
定时任务开启
|
9 months ago |
|
lijianlin
|
dede99f675
|
Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期
|
9 months ago |
|
lijianlin
|
cbf7711f53
|
计算bug修复
|
9 months ago |
|
huangqizhen
|
9dbb61ad6a
|
7.14数据同步修改
|
9 months ago |
|
huangqizhen
|
736ffc4733
|
7.14数据同步修改
|
9 months ago |
lihuilin
|
eb46e64401
|
Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期
|
9 months ago |
|
lijianlin
|
a80e3c61e9
|
工作台性能优化
|
9 months ago |
|
sunjiabei
|
2c7c94a4f8
|
重置可为0
|
9 months ago |
|
sunjiabei
|
5dbc73aaee
|
重置密码
|
9 months ago |
|
sunjiabei
|
d9abca0105
|
注释
|
9 months ago |
|
lijianlin
|
3153e8f795
|
工作台更新优化
|
9 months ago |
|
sunjiabei
|
f98ef0a92a
|
修改用户
|
9 months ago |
|
sunjiabei
|
f9082c8f64
|
修改用户
|
9 months ago |
|
lijianlin
|
fe7be57d2e
|
Merge branch 'refs/heads/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期
|
10 months ago |
|
sunjiabei
|
ea99e40db5
|
密码重置
|
10 months ago |
|
lijianlin
|
047d324482
|
更新管理员优化（还没写完）
|
10 months ago |
|
sunjiabei
|
5feaf37856
|
Merge branch 'milestone-20250702-金币重构一期' into sunjiabei/feature-20250710132313-二期模块
|
10 months ago |
|
lijianlin
|
4e5d9ea68a
|
Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期
|
10 months ago |
|
lijianlin
|
879b8da64f
|
修改管理员（部分）
|
10 months ago |
|
huangqizhen
|
aba4077ea9
|
Merge branch 'refs/heads/huangqizheng/feature-20250710151401-数据同步完成' into milestone-20250702-金币重构一期
|
10 months ago |
|
huangqizhen
|
c5f2e5261d
|
7.10数据库同步
|
10 months ago |
|
sunjiabei
|
3e71823a73
|
密码修改
|
10 months ago |
|
sunjiabei
|
47d0e611c8
|
密码修改
|
10 months ago |
|
sunjiabei
|
9b4f475625
|
密码模块
|
10 months ago |
|
lijianlin
|
e6950a483f
|
充值次数与首充时间修改
|
10 months ago |
|
lihuilin
|
5e39bde176
|
Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期
|
10 months ago |
|
huangqizhen
|
8949f2e9a0
|
7.9数据库同步
|
10 months ago |
|
lijianlin
|
130db4a62f
|
解开传erp限制，所有订单往erp传
|
10 months ago |
|
lijianlin
|
acc2965582
|
新增用户与更新用户1
|
10 months ago |
|
lijianlin
|
a36dc3d488
|
新增用户与更新用户
|
10 months ago |
|
sunjiabei
|
cf142e26c4
|
用户全部信息查询
|
10 months ago |
|
sunjiabei
|
ac71a60248
|
查id
|
10 months ago |
|
lijianlin
|
144271c3c8
|
Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期
|
10 months ago |
|
lijianlin
|
af8f888a88
|
退款驳回bug修复
|
10 months ago |
|
sunjiabei
|
abb6ef1aad
|
查id
|
10 months ago |
|
lijianlin
|
5362ee33c8
|
退款通过bug修复
|
10 months ago |
|
lihuilin
|
5166afcf0f
|
Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期
|
10 months ago |
|
lijianlin
|
f842a5a1c1
|
Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期
|
10 months ago |
|
lijianlin
|
0972f08e05
|
审核通过bug修复
|
10 months ago |
|
lihuilin
|
7a71dfa488
|
Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期
|
10 months ago |
|
sunjiabei
|
a40ea38f07
|
ADMI,
|
10 months ago |
|
lijianlin
|
6902e669b8
|
审核通过bug修复
|
10 months ago |
|
lijianlin
|
5fc7f2a3a0
|
Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期
|
10 months ago |
|
lijianlin
|
9bf8481d6e
|
Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期
|
10 months ago |
|
huangqizhen
|
cc352bd81d
|
Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期
|
10 months ago |
|
huangqizhen
|
055816a026
|
7.9导出筛选对象修复
|
10 months ago |
