zhengyongxing
|
24e33ed8ba
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Data/update.sql
|
4 years ago |
陈志
|
a15302bd8c
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化结算查看
|
4 years ago |
chenzhi
|
ed66facc8f
|
优化结算查看
|
4 years ago |
|
陈志
|
ce32492445
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化下游公司多比例结算
|
4 years ago |
|
chenzhi
|
8550109367
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
zyx
|
89801c1467
|
特殊补点功能完善
|
4 years ago |
|
zhengyongxing
|
e6bc6853aa
|
特殊补点结算功能添加
|
4 years ago |
|
chenzhi
|
ff19f3259f
|
优化下游公司多比例结算
|
4 years ago |
|
chenzhi
|
492d7a8f73
|
优化获取比例
|
4 years ago |
|
chenzhi
|
f5fb65e400
|
新增获取公司游戏比例
|
4 years ago |
|
chenzhi
|
8e2f07db38
|
优化系统任务注释
|
4 years ago |
|
chenzhi
|
4f70b89063
|
优化系统任务执行
|
4 years ago |
|
chenzhi
|
b88f2986bd
|
优化重算，兼容wind
|
4 years ago |
|
chenzhi
|
7ceafb1d42
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
6e49bcc353
|
优化财务汇总
|
4 years ago |
|
chenzhi
|
8b82fff791
|
优化任务插入
|
4 years ago |
|
chenzhi
|
62b566e8b8
|
优化地址填写
|
4 years ago |
|
陈志
|
15676c69b9
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
f0e43df7c2
|
新增重算
|
4 years ago |
|
chenzhi
|
fb75494c64
|
新增系统执行命令方法
|
4 years ago |
 廖金灵
|
f0aa844244
|
Merge branch 'hotfix/spend_stat_recharge' of wmtx/platform into master
优化
|
4 years ago |
|
ELF
|
3890410bec
|
优化
|
4 years ago |
|
廖金灵
|
90bb38cd56
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
修改BUG
|
4 years ago |
|
ELF
|
b1f4ec2d9a
|
修改
|
4 years ago |
|
廖金灵
|
747dc7394c
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
修改bug
|
4 years ago |
|
ELF
|
404da03cd0
|
修改
|
4 years ago |
|
廖金灵
|
35d34d1864
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
bug修复
|
4 years ago |
|
ELF
|
c7390f4c2e
|
bug修复
|
4 years ago |
|
廖金灵
|
8ae08a6784
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源权限
|
4 years ago |
|
ELF
|
2a52df9ebb
|
测试资源权限
|
4 years ago |
|
廖金灵
|
79af51d27b
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源发放
|
4 years ago |
|
廖金灵
|
7efbf84444
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
e249596014
|
修改
|
4 years ago |
|
chenzhi
|
f5ad1a6d0c
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
廖金灵
|
c9becc5033
|
Merge branch 'hotfix/cpcompany_gameinfo' of wmtx/platform into release
修正公司取消游戏推广员无效
|
4 years ago |
|
廖金灵
|
94db2ab11e
|
Merge branch 'hotfix/cpcompany_gameinfo' of wmtx/platform into master
修正公司取消游戏推广员无效
|
4 years ago |
|
chenzhi
|
9f06436207
|
优化转换注释
|
4 years ago |
|
廖金灵
|
445ce2d976
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into release
优化代码
|
4 years ago |
|
chenzhi
|
04ac1da1d7
|
优化公司控制会长游戏规则
|
4 years ago |
|
ELF
|
550da5cb37
|
测试
|
4 years ago |
|
chenzhi
|
e8eb963fc1
|
修正公司取消游戏推广员无效
|
4 years ago |
|
陈志
|
ab438affb2
|
Merge branch 'hotfix/cpcompany_gameinfo' of wmtx/platform into master
|
4 years ago |
|
chenzhi
|
3efc4daee6
|
优化跟随
|
4 years ago |
|
廖金灵
|
e9d0d6233c
|
Merge branch 'hotfix/cpcompany_gameinfo' of wmtx/platform into master
优化游戏数据跟随
|
4 years ago |
|
chenzhi
|
c137a10c8f
|
优化游戏数据跟随
|
4 years ago |
|
廖金灵
|
ec67b902fb
|
Merge branch 'hotfix/cpcompany_gameinfo' of wmtx/platform into master
优化游戏资质展示
|
4 years ago |
|
廖金灵
|
f457c0d52e
|
Merge branch 'hotfix/cpcompany_gameinfo' of wmtx/platform into release
优化游戏资质展示
|
4 years ago |
|
chenzhi
|
03341a7d9f
|
优化游戏资质展示
|
4 years ago |
|
chenzhi
|
6560047a11
|
yh
|
4 years ago |
|
chenzhi
|
e94c452f85
|
取消结算单的管理员审核
|
4 years ago |