张谷诚
|
ca605305e9
|
Merge branch 'feature/zgc_1126' of wmtx/platform into release
1126
|
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 |
|
zhengyongxing
|
9b87b9c4a1
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
41e9820d83
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
e138517136
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
710439d8df
|
11月功能提交
|
4 years ago |
|
ELF
|
289783eecd
|
修改
|
4 years ago |
|
tping
|
dd786dc27f
|
1126 批量上下架
|
4 years ago |
|
tping
|
b722175785
|
1126 权限
|
4 years ago |
|
chenzhi
|
986065ab4b
|
优化名词
|
4 years ago |
|
tping
|
033cd00aee
|
1126
|
4 years ago |
|
zhengyongxing
|
c749df4936
|
11月功能提交
|
4 years ago |
|
tping
|
d8924dc8be
|
1126 客服qq
|
4 years ago |
|
zhengyongxing
|
36d40bc24e
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
5add29fa6b
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
8bce1bd12c
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
2040991894
|
11月功能提交
|
4 years ago |
|
万盟天下
|
4f185eeb8a
|
Merge branch 'feature/promote_tg_dm' of wmtx/platform into release
优化当前域名获取
|
4 years ago |
|
ELF
|
a0f57749c4
|
优化当前域名获取
|
4 years ago |
|
万盟天下
|
e81ccd7d34
|
Merge branch 'feature/promote_tg_dm' of wmtx/platform into release
添加域名前缀限制
|
4 years ago |
|
ELF
|
ef8334dd18
|
添加域名前缀限制
|
4 years ago |
|
chenzhi
|
e7501be7c3
|
优化审核流程
|
4 years ago |
|
万盟天下
|
b698b82409
|
Merge branch 'feature/promote_tg_dm' of wmtx/platform into release
根据推广公司配置推广后台
|
4 years ago |
|
tping
|
ff4975bacb
|
1126
|
4 years ago |
|
zhengyongxing
|
f3a45dfac6
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
a6263b2205
|
11月功能提交
|
4 years ago |
|
张谷诚
|
ccd5b487a9
|
Merge branch 'hotfix/pay_notice1123' of wmtx/platform into master
支付通知 补单
|
4 years ago |
|
tping
|
3471639489
|
支付通知 补单
|
4 years ago |
|
张谷诚
|
0da46347ac
|
Merge branch 'hotfix/pay_notice1123' of wmtx/platform into master
支付回调小数点后面.00处理
|
4 years ago |
|
tping
|
103acdd15d
|
支付通知 小数点后面.00
|
4 years ago |
|
chenzhi
|
5bdc0e6f6e
|
优化汇总方案
|
4 years ago |
|
tping
|
0d52dc7d61
|
1126
|
4 years ago |
|
chenzhi
|
55dd67e34d
|
优化撤回
|
4 years ago |
|
chenzhi
|
56681580dd
|
合并
|
4 years ago |
|
chenzhi
|
6d4fce53eb
|
优化线下打款
|
4 years ago |
|
chenzhi
|
bd125be3dd
|
优化汇总审核流程
|
4 years ago |
|
ELF
|
c339623c78
|
优化
|
4 years ago |
|
elf@home
|
dd66846e68
|
根据推广公司配置推广后台
|
4 years ago |