zhengyongxing
|
dbad9a08db
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
Conflicts:
Application/Admin/Common/function.php
Application/Admin/Controller/TimingController.class.php
|
5 years ago |
|
zhengyongxing
|
39e2bce6dd
|
推广员充值统计提交
|
5 years ago |
 廖金灵
|
00b69f820f
|
Merge branch 'feature/market_admin' of wmtx/platform into release
市场绑定换绑
|
5 years ago |
|
ELF
|
990a2bd206
|
解决冲突
|
5 years ago |
|
廖金灵
|
8455acd392
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
新增不验证手机 己方
|
5 years ago |
chenzhi
|
a020cb26df
|
新增不验证手机 己方
|
5 years ago |
|
廖金灵
|
a40a3b36bb
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化比例分成无需大于上月
|
5 years ago |
|
chenzhi
|
91ae987c3c
|
优化游戏比例分成无需大于
|
5 years ago |
|
chenzhi
|
9dd4a507e9
|
隐藏模板批量操作
|
5 years ago |
|
chenzhi
|
f1824fd7b3
|
优化新增名称
|
5 years ago |
|
ELF
|
7c3a001e25
|
修改
|
5 years ago |
|
chenzhi
|
4fde001d4e
|
优化游戏分成比例不受档位限制
|
5 years ago |
|
ELF
|
102e77267d
|
修改bug
|
5 years ago |
|
chenzhi
|
c76cf038cd
|
己方公司
|
5 years ago |
|
ELF
|
e94b6418f1
|
修改
|
5 years ago |
|
ELF
|
8224cfb362
|
修改
|
5 years ago |
|
ELF
|
77c692c44d
|
修改
|
5 years ago |
|
zhengyongxing
|
ca5c68d078
|
推广公司编辑添加合并错误去除
|
5 years ago |
|
zhengyongxing
|
f63b115641
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/add.html
# Application/Admin/View/PromoteCompany/edit.html
|
5 years ago |
|
zhengyongxing
|
2fae4219df
|
公会统计去除
|
5 years ago |
|
zhengyongxing
|
a8f4f16349
|
Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/view.html
# Data/update.sql
|
5 years ago |
|
ELF
|
e3b53e7df1
|
修改
|
5 years ago |
|
ELF
|
73f5f4f5ea
|
修改
|
5 years ago |
|
ELF
|
38c10a0f7a
|
修改
|
5 years ago |
|
ELF
|
10aed50db7
|
修改
|
5 years ago |
|
ELF
|
f9b054e1cb
|
修改
|
5 years ago |
|
ELF
|
34691d6baa
|
修改
|
5 years ago |
|
ELF
|
f0a8b6bc3b
|
修改
|
5 years ago |
|
ELF
|
6f2f588617
|
优化
|
5 years ago |
|
廖金灵
|
d4f557d96d
|
Merge branch 'hotfix/sms_send_error' of wmtx/platform into master
发送短信问题
|
5 years ago |
|
廖金灵
|
25edefda3e
|
Merge branch 'hotfix/sms_send_error' of wmtx/platform into release
修改短信提示
|
5 years ago |
yulingwei
|
2680f92079
|
1
|
5 years ago |
|
ELF
|
11caa30cfa
|
修改
|
5 years ago |
|
yulingwei
|
4058eb3963
|
1
|
5 years ago |
|
ELF
|
76fcfec7c2
|
修改
|
5 years ago |
|
廖金灵
|
12fd48f315
|
Merge branch 'hotfix/sms_send_error' of wmtx/platform into release
修复短信发送问题
|
5 years ago |
|
yulingwei
|
22ac6bf293
|
修复问题
|
5 years ago |
|
ELF
|
5f5a6ee1af
|
修改
|
5 years ago |
|
廖金灵
|
c1163e7b22
|
Merge branch 'release' of wmtx/platform into master
版本更新2020.06.24
|
5 years ago |
|
廖金灵
|
4989deb7be
|
Merge branch 'feature/loginInfo' of wmtx/platform into release
验证码提示样式修改
|
5 years ago |
|
yulingwei
|
efe84158da
|
修改错误样式
|
5 years ago |
|
廖金灵
|
997431d885
|
Merge branch 'feature/order_coin' of wmtx/platform into release
平台币金额解释添加
|
5 years ago |
|
zhengyongxing
|
c3956f7ed2
|
平台币金额解释添加
|
5 years ago |
|
廖金灵
|
bc00b1112f
|
Merge branch 'feature/apply_game' of wmtx/platform into release
task440
|
5 years ago |
|
廖金灵
|
1907985e7b
|
Merge branch 'feature/ylw-06-10' of wmtx/platform into release
新增公司选择默认模板
|
5 years ago |
|
廖金灵
|
2fe024f696
|
Merge branch 'feature/loginInfo' of wmtx/platform into release
新增手机号限制
|
5 years ago |
|
yulingwei
|
ff9b2249b8
|
新增公司默认选择默认模板
|
5 years ago |
|
yulingwei
|
34df4e5a8e
|
upt
|
5 years ago |
|
廖金灵
|
db32f11215
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
|
5 years ago |
|
chenzhi
|
7d8dca7421
|
取消测试的虚拟验证码
|
5 years ago |