chenzhi
|
c0926299dc
|
优化平台币充值
|
4 years ago |
tping
|
824b7b3f06
|
公会信息导入导出
|
4 years ago |
|
chenzhi
|
fa9dc518d5
|
导出
|
4 years ago |
|
chenzhi
|
4fdb94c617
|
优化订单查询
|
4 years ago |
|
chenzhi
|
45d883e89c
|
优化渠道统计
|
4 years ago |
zhengyongxing
|
7c4e0e7521
|
12.18功能提交
|
4 years ago |
|
zhengyongxing
|
8430fa1813
|
12.18功能提交
|
4 years ago |
|
chenzhi
|
19c62de87c
|
優化公會統計
|
4 years ago |
张谷成
|
e669d1bc38
|
Merge pull request '刷新' (#38) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/38
|
4 years ago |
|
tping
|
6e63176176
|
刷新
|
4 years ago |
|
tping
|
24fcfc4b90
|
公会信息
|
4 years ago |
|
张谷成
|
a7553cf116
|
Merge pull request '1' (#36) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/36
|
4 years ago |
|
tping
|
1dbc61a602
|
1
|
4 years ago |
|
tping
|
0f7b23ad57
|
1
|
4 years ago |
|
张谷成
|
0c7e4b2d30
|
Merge pull request 'hotfix/1211bug' (#35) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/35
|
4 years ago |
|
tping
|
858e929199
|
甲乙方公司
|
4 years ago |
|
tping
|
304c59be10
|
甲乙方公司
|
4 years ago |
|
tping
|
08df25eab3
|
展示错误
|
4 years ago |
|
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
|
87c6c71d0a
|
汇总bug修改
|
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
|
ad73fe03b3
|
优化上游结算
|
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 |
|
ELF
|
9f61cdade9
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into release
|
4 years ago |
|
chenzhi
|
3fdc14120f
|
优化首页折线
|
4 years ago |
郑永星
|
9d93f9d56f
|
Merge pull request '未结算数据的补充' (#25) from feature/add_item into release
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
77678249bf
|
未结算数据的补充
|
4 years ago |
|
郑永星
|
bbfc5f64b8
|
Merge pull request 'feature/add_item' (#24) from feature/add_item into release
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
84efc4d76d
|
未结算数据的补充
|
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 |
|
廖金灵
|
ace44195c5
|
Merge pull request 'hotfix/and_bug' (#22) from hotfix/and_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/22
|
4 years ago |
|
chenzhi
|
78451f0551
|
消除打印信息
|
4 years ago |
|
chenzhi
|
96ead18ff6
|
优化打印
|
4 years ago |
|
chenzhi
|
7abcd38f36
|
解决推广公司bug
|
4 years ago |
|
廖金灵
|
3bedf259a0
|
Merge pull request 'feature/1211' (#21) from feature/1211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/21
|
4 years ago |
陈志
|
7286e3d157
|
Merge pull request 'hotfix/and_bug' (#20) from hotfix/and_bug into release
优化下游推广公司搜索
|
4 years ago |
|
chenzhi
|
fb798e82bf
|
优化下游推广公司搜索
|
4 years ago |
|
tping
|
e4ef55531a
|
特殊公司评级管理权限
|
4 years ago |
|
tping
|
e495105ed0
|
会长可以看
|
4 years ago |
|
chenzhi
|
fe75b57618
|
合并master
|
4 years ago |
|
廖金灵
|
72135079fa
|
Merge pull request '数据授权js错误修正' (#16) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/16
|
4 years ago |
|
zhengyongxing
|
a31e3bf1ab
|
数据授权js错误修正
|
4 years ago |
|
chenzhi
|
0d533525fe
|
优化权限修改
|
4 years ago |
|
tping
|
15c841e883
|
Merge branch 'release' into feature/1211
|
4 years ago |
|
tping
|
553ce102df
|
特殊公司
|
4 years ago |
|
郑永星
|
1f75da3603
|
Merge pull request '手机万能验证码隐藏' (#13) from feature/add_item into release
手机万能验证码隐藏
|
4 years ago |
|
zhengyongxing
|
9736a32013
|
手机万能验证码隐藏
|
4 years ago |
|
郑永星
|
bc162ada96
|
Merge pull request '手机验证码修改账号' (#12) from feature/add_item into release
手机验证码修改账号
|
4 years ago |
|
zhengyongxing
|
d47b6a3fad
|
手机验证码修改账号
|
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 |
|
郑永星
|
48bf17afd3
|
Merge pull request 'feature/add_item' (#10) from feature/add_item into release
短信登录万能验证码登录开启
|
4 years ago |
|
zhengyongxing
|
0d9dd3b22e
|
短信登录万能验证码登录开启
|
4 years ago |
|
zhengyongxing
|
11e64947df
|
12月功能提交
|
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 |
|
chenzhi
|
28e93fe832
|
新增文件
|
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
|
0fd16f89d8
|
Merge branch 'release' into feature/1211
|
4 years ago |
|
zhengyongxing
|
a0150c300f
|
12月功能提交
|
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 |
|
zhengyongxing
|
e74d46bc49
|
Merge branch 'feature/add_item' of 8.136.139.249:wmtx/platform into feature/add_item
|
4 years ago |
|
zhengyongxing
|
c0aa5d2dbc
|
12份功能提交
|
4 years ago |
|
廖金灵
|
bdad3f8db9
|
Merge branch 'release' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
fb0acddb3f
|
12份功能提交
|
4 years ago |
|
chenzhi
|
753098a85f
|
优化子站点配置
|
4 years ago |
|
chenzhi
|
f034698dbc
|
新增多库
|
4 years ago |
|
zhengyongxing
|
21592a67cd
|
12份功能提交
|
4 years ago |
|
zhengyongxing
|
85f523329a
|
12份功能提交
|
4 years ago |
|
zhengyongxing
|
b8c811c532
|
12份功能提交
|
4 years ago |
|
zhengyongxing
|
0155dadf8e
|
12份功能提交
|
4 years ago |
|
zhengyongxing
|
68fb680b4c
|
12份功能提交
|
4 years ago |
|
zhengyongxing
|
e8203057cd
|
12份功能提交
|
4 years ago |
|
zhengyongxing
|
210da712f9
|
12份功能提交
|
4 years ago |
|
zhengyongxing
|
f9488320e9
|
名称bug修改
|
4 years ago |
|
zhengyongxing
|
af5aad352a
|
备注bug修改
|
4 years ago |
|
tping
|
481646222f
|
后台 手机号规则 实名认证修改
|
4 years ago |
|
tping
|
5cf8f2ea10
|
特殊公司
|
4 years ago |
|
zhengyongxing
|
ec3491943b
|
12月功能提交
|
4 years ago |
|
ELF
|
f2be33c427
|
修改
|
4 years ago |
|
ELF
|
b73b502a67
|
修改
|
4 years ago |
|
zhengyongxing
|
52ff4a2bc6
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
9bec07c7d4
|
不结算bug修改
|
4 years ago |
|
zhengyongxing
|
747224dae9
|
12月功能提交
|
4 years ago |
|
tping
|
33ef14e1af
|
特殊外团
|
4 years ago |
|
tping
|
e79f18e618
|
1211 审核列表 甲乙方公司
|
4 years ago |
|
zhengyongxing
|
50b5e2cf0e
|
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
|
0e416af776
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
8bb8e4379f
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
b8af3ea384
|
12月功能提交
|
4 years ago |
|
chenzhi
|
4f1bebc3af
|
优化游戏统计说明
|
4 years ago |
|
zhengyongxing
|
7e41ad1e18
|
12月功能提交
|
4 years ago |
|
zyx
|
6b0de87280
|
未结算接口修改
|
4 years ago |
|
chenzhi
|
2bc72f9ae2
|
优化个人补点不修改公式
|
4 years ago |
|
chenzhi
|
8d1f77537a
|
优化订单列表新增列
|
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 |
|
ELF
|
f58e565fe7
|
修改
|
4 years ago |
|
zhengyongxing
|
166c1d63d6
|
12月功能提交
|
4 years ago |
|
ELF
|
e5a0117912
|
修改
|
4 years ago |
|
tping
|
31ce7b071c
|
1211
|
4 years ago |
|
ELF
|
1b74318619
|
修改
|
4 years ago |
|
zhengyongxing
|
50958acb3e
|
12月功能提交
|
4 years ago |
|
ELF
|
c8f082cee8
|
优化显示
|
4 years ago |
|
ELF
|
78caa452b2
|
测试资源添加审核人
|
4 years ago |
|
ELF
|
88402dfac0
|
修改
|
4 years ago |
|
zhengyongxing
|
16f514d084
|
12月功能提交
|
4 years ago |
|
廖金灵
|
9483e4b7b3
|
Merge branch 'feature/add_item' of wmtx/platform into master
编辑页面调整,及多个编辑错误修正
|
4 years ago |
|
zhengyongxing
|
7c5c67a87c
|
编辑页面调整,及多个编辑错误修正
|
4 years ago |
|
zhengyongxing
|
2758c608ad
|
编辑扣款旧的验证添加
|
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
|
d06cc0ea10
|
优化去除同公司奖罚
|
4 years ago |
|
chenzhi
|
3053461ee5
|
优化奖罚排序
|
4 years ago |
|
廖金灵
|
401ad97cbc
|
Merge branch 'feature/add_item' of wmtx/platform into master
编辑扣款旧的验证添加
|
4 years ago |
|
zhengyongxing
|
bb0d37bb53
|
编辑扣款旧的验证添加
|
4 years ago |
|
zhengyongxing
|
10ddadece7
|
js字符类型修改成数字类型
|
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 |