yulingwei
|
e26f517df1
|
冲突解决
|
5 years ago |
|
yulingwei
|
747bba16b0
|
汇总结算单管理
|
5 years ago |
|
yulingwei
|
40ddeae55a
|
upt
|
5 years ago |
|
yulingwei
|
47d01e0aff
|
upt
|
5 years ago |
zhengyongxing
|
5626dfaf99
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
zhengyongxing
|
21cac27332
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
70ddcb63e0
|
生成下游个人结算单bug修改
|
5 years ago |
zhengchanglong
|
858c028faf
|
Merge branch 'feature/add_promote_company' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
e6d136410d
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
065cf7d566
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
zhengyongxing
|
938a82e993
|
生成下游个人结算单bug修改
|
5 years ago |
liuweiwen
|
e15460b08f
|
合作方
|
5 years ago |
chenzhi
|
6bb3387b0e
|
新增推广公司分成比例百分号
|
5 years ago |
|
chenzhi
|
f507dde70b
|
新增推广公司导出功能
|
5 years ago |
|
yulingwei
|
dfe52865bd
|
upt
|
5 years ago |
|
zhengyongxing
|
64122ca8c7
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengchanglong
|
5f5abce2ec
|
玩家信息数据显示权限BUG修复
|
5 years ago |
|
zhengyongxing
|
0b7327bc4e
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
 ELF
|
055e246f70
|
修改bug
|
5 years ago |
|
liuweiwen
|
6d13be7863
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
7da5e25e16
|
合作方
|
5 years ago |
|
zhengchanglong
|
c066620128
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
chenzhi
|
a26a1191cc
|
优化上游结算提示
|
5 years ago |
|
yulingwei
|
469a037b0f
|
merge
|
5 years ago |
|
yulingwei
|
3c44d5d200
|
upt
|
5 years ago |
|
zhengchanglong
|
99f62f3c14
|
Merge branch 'feature/admin_optimize' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenzhi
|
44a34bc89f
|
新增推广公司删除
|
5 years ago |
|
chenzhi
|
4e28b39999
|
新增推广公司编辑功能
|
5 years ago |
|
chenzhi
|
6ea7a581f5
|
推广公司查看
|
5 years ago |
|
chenzhi
|
f218544e7f
|
优化推广公司添加
|
5 years ago |
|
chenzhi
|
da2e3a769c
|
推广列表查看
|
5 years ago |
|
liuweiwen
|
a1c3ad8fb3
|
数据展示权限
|
5 years ago |
|
liuweiwen
|
4b480e6f94
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
8462f80777
|
合作方
|
5 years ago |
|
zhengchanglong
|
4ce9af39e5
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
fb14c5888a
|
Merge branch 'hotfix/test_order' into release
|
5 years ago |
|
zhengyongxing
|
a9924e67c1
|
测试订单列表与录入bug修改
|
5 years ago |
|
zhengyongxing
|
2d0d59c0a5
|
Merge branch 'hotfix/test_order' of 47.111.118.107:wmtx/platform into hotfix/test_order
Conflicts:
Application/Admin/Controller/TestOrderController.class.php
|
5 years ago |
|
zhengyongxing
|
12903ef3cd
|
测试订单列表与录入bug修改
|
5 years ago |
|
chenzhi
|
38fc3c3054
|
推广公司列表2
|
5 years ago |
|
chenzhi
|
a3aa3700a7
|
修正company_belong模糊问题
|
5 years ago |
|
chenzhi
|
542c76f266
|
推广公司列表1
|
5 years ago |
|
zhengyongxing
|
cf2cb338f1
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
zhengyongxing
|
8dd5f7bf5c
|
结算单管理添加
|
5 years ago |
|
chenzhi
|
1f1e75e736
|
新增推广公司添加
|
5 years ago |
|
chenzhi
|
6a612565c6
|
扩展推广公司添加
|
5 years ago |
chenxiaojun
|
15ed062db3
|
管理后台>推广员>结算管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
b2909d07d9
|
管理后台>推广员>结算管理>公会分成管理--更新
|
5 years ago |
sunke
|
3dbacf225b
|
指标下载处理
|
5 years ago |
|
sunke
|
ffd29e2662
|
指标导出处理
|
5 years ago |