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 |
|
廖金灵
|
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 |
陈志
|
dffb70f798
|
Merge branch 'feature/game_change_statement_20201125' of wmtx/platform into release
优化是否参与结算导出
|
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 |
|
廖金灵
|
1b3a365409
|
Merge branch 'hotfix/promote_group_view_recharge' of wmtx/platform into release
雷雨等导量公会组长可以看到充值信息
|
4 years ago |
|
zhengyongxing
|
ef13761820
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item_others
|
4 years ago |
|
ELF
|
d43d0c2628
|
雷雨等导量公会组长可以看到充值信息
|
4 years ago |
|
zhengyongxing
|
d6b8fa208c
|
汇总刷新接口提交
|
4 years ago |
|
zhengyongxing
|
baca13a95e
|
换行字数修正
|
4 years ago |
|
ELF
|
1bb1b284e6
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
|
4 years ago |
|
chenzhi
|
2890f3e820
|
优化订单查看
|
4 years ago |
|
chenzhi
|
147cac3a9e
|
优化公会统计
|
4 years ago |
|
chenzhi
|
b9b497e255
|
优化公会结算
|
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
|
7e1d2fb879
|
优化日志
|
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 |
|
郑永星
|
a866fd6b8d
|
Merge branch 'feature/add_item' of wmtx/platform into release
保留两位小数判断
|
4 years ago |
|
zhengyongxing
|
711992a287
|
保留两位小数判断
|
4 years ago |
|
chenzhi
|
eeb1821859
|
暂存
|
4 years ago |
|
郑永星
|
9b36a1c6bc
|
Merge branch 'feature/add_item' of wmtx/platform into release
保留两位小数
|
4 years ago |
|
zhengyongxing
|
c829c56956
|
保留两位小数
|
4 years ago |
|
郑永星
|
66902a13ec
|
Merge branch 'feature/add_item' of wmtx/platform into release
内团去除比例结束时间减1
|
4 years ago |
|
zhengyongxing
|
1717c2958b
|
最大值判断添加
|
4 years ago |
|
zhengyongxing
|
4dd097667f
|
内团去除比例结束时间减1
|
4 years ago |
|
郑永星
|
37d1419bb9
|
Merge branch 'feature/add_item' of wmtx/platform into release
最大值判断添加
|
4 years ago |
|
zhengyongxing
|
ff21751d31
|
最大值判断添加
|
4 years ago |
万盟天下
|
8482cd9382
|
Merge branch 'feature/elf_version_1117' of wmtx/platform into release
修改游戏统计bug
|
4 years ago |
|
ELF
|
e46cc5b52e
|
修改bug
|
4 years ago |
|
zhengyongxing
|
640cb01bbb
|
12月功能提交
|
4 years ago |
|
tping
|
43c62c05d7
|
Merge branch 'release' into feature/zgc_1126
# Conflicts:
# Application/Admin/View/PromoteCompany/add.html
# Application/Admin/View/PromoteCompany/edit.html
|
4 years ago |
|
万盟天下
|
4557b3dc2f
|
Merge branch 'feature/elf_version_1117' of wmtx/platform into release
修改游戏统计bug
|
4 years ago |
|
ELF
|
47fcab323b
|
修改游戏统计bug
|
4 years ago |
|
万盟天下
|
41ab9703a9
|
Merge branch 'feature/add_item' of wmtx/platform into release
11月功能提交
|
4 years ago |
|
万盟天下
|
82cf73ede5
|
Merge branch 'feature/elf_version_1117' of wmtx/platform into release
游戏统计/后台登录时间修改
|
4 years ago |
|
zhengyongxing
|
b32f5efd91
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
46f33b3d05
|
12月功能提交
|
4 years ago |
|
chenzhi
|
9da9941c9f
|
优化支付数据查看
|
4 years ago |
|
zhengyongxing
|
3d1ab70123
|
11月功能提交
|
4 years ago |
|
ELF
|
f95125892a
|
优化推广员后台汇总查询
|
4 years ago |
|
zhengyongxing
|
5c27c63835
|
11月功能提交
|
4 years ago |
|
廖金灵
|
5c23366b73
|
Merge branch 'feature/promote_tg_dm' of wmtx/platform into master
根据推广公司配置推广后台
|
4 years ago |
|
ELF
|
7468057834
|
推广员结算订单归属
|
4 years ago |