tping
|
d6f34127df
|
1
|
4 years ago |
chenzhi
|
5b5029d570
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
|
4 years ago |
|
chenzhi
|
5f0d0a7101
|
优化游戏统计导出
|
4 years ago |
|
chenzhi
|
c5bc21cb36
|
优化游戏导出
|
4 years ago |
|
chenzhi
|
f00ef7fcc9
|
优化导出
|
4 years ago |
|
chenzhi
|
236bd8f538
|
优化财务游戏汇总
|
4 years ago |
|
chenzhi
|
76874cf34a
|
优化游戏统计
|
4 years ago |
张谷成
|
91701cc612
|
Merge pull request '公会信息' (#34) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/34
|
4 years ago |
 廖金灵
|
feb46d1954
|
Merge pull request 'feature/add_item_two' (#33) from feature/add_item_two into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/33
|
4 years ago |
zhengyongxing
|
699449a702
|
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
0c49d1d655
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two
|
4 years ago |
|
zhengyongxing
|
c30e396b2c
|
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
32abdbb390
|
汇总统计修改
|
4 years ago |
|
chenzhi
|
fc75b7d81d
|
优化统计
|
4 years ago |
|
chenzhi
|
79588d52e8
|
优化财务汇总
|
4 years ago |
|
chenzhi
|
8ef35174dc
|
优化个人补点
|
4 years ago |
|
chenzhi
|
419793d91b
|
优化上游结算
|
4 years ago |
|
tping
|
0aef9e3019
|
公会信息
|
4 years ago |
|
chenzhi
|
e6af0fbcd5
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
|
4 years ago |
|
chenzhi
|
b7cc3ccd77
|
优化权限
|
4 years ago |
|
chenzhi
|
3fdc14120f
|
优化首页折线
|
4 years ago |
郑永星
|
6699ce1045
|
Merge pull request '未结算数据的补充' (#23) from feature/add_item into release
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
f13ee0583c
|
未结算数据的补充
|
4 years ago |
|
chenzhi
|
d08691c13a
|
优化充值列表导出
|
4 years ago |
|
chenzhi
|
29636f2922
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
|
4 years ago |
|
chenzhi
|
fb798e82bf
|
优化下游推广公司搜索
|
4 years ago |
|
chenzhi
|
fe75b57618
|
合并master
|
4 years ago |
|
chenzhi
|
0d533525fe
|
优化权限修改
|
4 years ago |
|
廖金灵
|
342b592976
|
Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
|
4 years ago |
|
郑永星
|
ca8a2ada0e
|
Merge pull request '12月功能提交,手机万能验证码屏蔽提交' (#7) from feature/add_item into release
12月功能提交,手机万能验证码屏蔽提交
|
4 years ago |
|
zhengyongxing
|
309b195986
|
12月功能提交
|
4 years ago |
陈志
|
79ad02ba2e
|
Merge pull request '优化' (#9) from feature/st_mange_20201202 into release
优化
|
4 years ago |
|
chenzhi
|
1945cae9a5
|
优化
|
4 years ago |
|
张谷成
|
6e63a3857e
|
Merge pull request 'feature/1211' (#8) from feature/1211 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/8
|
4 years ago |
|
tping
|
cf88d4c1db
|
Merge branch 'release' into feature/1211
# Conflicts:
# Application/Home/Controller/BaseController.class.php
|
4 years ago |
|
tping
|
6c266178df
|
数据互通
|
4 years ago |
|
陈志
|
9d30d48fac
|
Merge pull request 'feature/st_mange_20201202' (#6) from feature/st_mange_20201202 into release
优化公式
|
4 years ago |
|
chenzhi
|
f4f430cf61
|
优化公式
|
4 years ago |
|
zhengyongxing
|
23e5632eec
|
12月功能提交
|
4 years ago |
|
chenzhi
|
a3e0ecb949
|
优化结算公式
|
4 years ago |
|
chenzhi
|
0f82acf447
|
优化权限修改
|
4 years ago |
|
zhengyongxing
|
f804b7af3f
|
12份功能提交
|
4 years ago |
|
廖金灵
|
bdad3f8db9
|
Merge branch 'release' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
fb0acddb3f
|
12份功能提交
|
4 years ago |
|
chenzhi
|
f034698dbc
|
新增多库
|
4 years ago |
|
tping
|
481646222f
|
后台 手机号规则 实名认证修改
|
4 years ago |
|
zhengyongxing
|
ec3491943b
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
52ff4a2bc6
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
9bec07c7d4
|
不结算bug修改
|
4 years ago |
|
zhengyongxing
|
747224dae9
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
27ffddfe75
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
# Conflicts:
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
8bb8e4379f
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
b8af3ea384
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
7e41ad1e18
|
12月功能提交
|
4 years ago |
|
zyx
|
6b0de87280
|
未结算接口修改
|
4 years ago |
|
chenzhi
|
a741e8d37d
|
订单新增设备类型
|
4 years ago |
|
chenzhi
|
0b979d9b68
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/st_mange_20201202
|
4 years ago |
|
chenzhi
|
24f3489e65
|
优化导出新增公式
|
4 years ago |
|
chenzhi
|
8d156ffb64
|
新增结算公式
|
4 years ago |
|
zhengyongxing
|
166c1d63d6
|
12月功能提交
|
4 years ago |
|
ELF
|
78caa452b2
|
测试资源添加审核人
|
4 years ago |
|
ELF
|
88402dfac0
|
修改
|
4 years ago |
|
廖金灵
|
9483e4b7b3
|
Merge branch 'feature/add_item' of wmtx/platform into master
编辑页面调整,及多个编辑错误修正
|
4 years ago |
|
zhengyongxing
|
7c5c67a87c
|
编辑页面调整,及多个编辑错误修正
|
4 years ago |
|
ELF
|
cf42967f4f
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
|
4 years ago |
|
ELF
|
b28e00b9f2
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
|
4 years ago |
|
chenzhi
|
3053461ee5
|
优化奖罚排序
|
4 years ago |
|
廖金灵
|
5b096ad2ff
|
Merge branch 'feature/add_item' of wmtx/platform into master
11月bug修复
|
4 years ago |
|
zhengyongxing
|
923851fea7
|
11月bug修复
|
4 years ago |
|
廖金灵
|
470bcdfebf
|
Merge branch 'feature/add_item' of wmtx/platform into master
11月bug修复
|
4 years ago |
|
chenzhi
|
943d63faac
|
优化财务汇总
|
4 years ago |
|
zhengyongxing
|
564a2ec91d
|
11月bug修复
|
4 years ago |
郑永星
|
3f7c20c3ab
|
Merge branch 'feature/add_item' of wmtx/platform into release
11月bug修复
|
4 years ago |
|
zhengyongxing
|
0e67e37436
|
11月bug修复
|
4 years ago |
|
郑永星
|
e179d507e8
|
Merge branch 'feature/add_item' of wmtx/platform into release
11月bug修复
|
4 years ago |
|
zhengyongxing
|
0572fde5ad
|
11bug修复
|
4 years ago |
|
廖金灵
|
3e27f09e7d
|
Merge branch 'feature/add_item' of wmtx/platform into master
特殊补点用户名修正
|
4 years ago |
|
chenzhi
|
a20285a42e
|
优化是否参与结算导出
|
4 years ago |
|
zhengyongxing
|
08dd238ca4
|
特殊补点用户名修正
|
4 years ago |
|
chenzhi
|
e7cd32b2a2
|
优化是否结算参数
|
4 years ago |
|
廖金灵
|
bfbac3b30a
|
Merge branch 'feature/add_item' of wmtx/platform into master
汇总刷新接口提交
|
4 years ago |
|
zhengyongxing
|
ef13761820
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item_others
|
4 years ago |
|
zhengyongxing
|
d6b8fa208c
|
汇总刷新接口提交
|
4 years ago |
|
chenzhi
|
9ddfb6f794
|
现在参与结算筛选
|
4 years ago |
|
chenzhi
|
9803de1edb
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/game_change_statement_20201125
|
4 years ago |
|
chenzhi
|
2d0bba8de5
|
优化修改推广游戏操作日志
|
4 years ago |
|
chenzhi
|
5644570c1e
|
新增日志
|
4 years ago |
陈志
|
4da7fa623f
|
Merge branch 'feature/add_item' of wmtx/platform into release
优化新增仅单参与结算是结算
|
4 years ago |
|
chenzhi
|
5e9723b040
|
优化新增仅单参与结算是结算
|
4 years ago |
|
chenzhi
|
74d9d6ed18
|
优化充值操作
|
4 years ago |
|
郑永星
|
9a008d2bfc
|
Merge branch 'feature/add_item' of wmtx/platform into release
换行字数修正
|
4 years ago |
|
zhengyongxing
|
b54b37e99c
|
换行字数修正
|
4 years ago |
|
郑永星
|
4262b55a66
|
Merge branch 'feature/add_item' of wmtx/platform into release
市场业绩bug修正
|
4 years ago |
|
zhengyongxing
|
59ec6c28ca
|
市场业绩bug修正
|
4 years ago |
|
陈志
|
ff23d13c54
|
Merge branch 'feature/game_select_bug' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
73f8c16379
|
游戏统计修改bug
|
4 years ago |
|
郑永星
|
89909c10fd
|
Merge branch 'feature/add_item' of wmtx/platform into release
小数点保留
|
4 years ago |
|
zhengyongxing
|
ed8d1fee0a
|
小数点保留
|
4 years ago |
|
郑永星
|
d090b707dc
|
Merge branch 'feature/add_item' of wmtx/platform into release
小数点保留两位添加
|
4 years ago |
|
zhengyongxing
|
b54b2660d4
|
小数点保留两位添加
|
4 years ago |