jbrazz
|
0dcb2a2014
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
jbrazz
|
c9996e071c
|
fix grand_id
|
5 years ago |
chenzhi
|
58db110844
|
合并
|
5 years ago |
|
chenzhi
|
115bafc067
|
新增补链日期及取消补链功能
|
5 years ago |
 ELF
|
831456b333
|
解决冲突
|
5 years ago |
|
chenzhi
|
7e37f3a2df
|
优化迁移用户addshifttask
|
5 years ago |
|
jbrazz
|
9300280f78
|
merge feture/ylw
|
5 years ago |
|
jbrazz
|
2dd1372b78
|
upt
|
5 years ago |
|
jbrazz
|
db1ea1370a
|
upt
|
5 years ago |
|
jbrazz
|
5e9cfb023f
|
uypt
|
5 years ago |
Your Name
|
f642fb2c90
|
游戏充值订单添加CP订单号字段
|
5 years ago |
|
jbrazz
|
74be3407b1
|
upt
|
5 years ago |
|
ELF
|
a8bc52df33
|
修改
|
5 years ago |
zyx
|
cbfb286d53
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
zyx
|
5f673b346d
|
月结统计添加部长渠道
|
5 years ago |
|
ELF
|
eb15fc7dfc
|
Merge branch 'feature/pack' into feature/promote
|
5 years ago |
|
chenzhi
|
9a6c75b41d
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
a653b46f0e
|
优化月份统计接口新增事务
|
5 years ago |
|
jbrazz
|
8a2c99681a
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
c2e686c38e
|
123
|
5 years ago |
|
chenzhi
|
537ed0857a
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
9d09fa4665
|
4角色聚合
|
5 years ago |
|
zyx
|
5eca14b69e
|
Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
zyx
|
9e9d742275
|
导出添加引号
|
5 years ago |
zhengchanglong
|
943564f82d
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
d5a90238ec
|
导出加大默认内存
|
5 years ago |
|
jbrazz
|
c66c35b686
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
jbrazz
|
68df391d9c
|
upt
|
5 years ago |
|
zhengchanglong
|
0223ecb125
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
35e1b2631a
|
导出添加游戏订单号
|
5 years ago |
|
zhengchanglong
|
945ea1173a
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
a307bf343e
|
游戏详情查看导出，按日期分成多个sheet
|
5 years ago |
|
zhengchanglong
|
2d67812f90
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
7e4aaf0a2e
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
zyx
|
266202c06b
|
游戏详情查看导出，按日期分成多个sheet
|
5 years ago |
|
Your Name
|
330216e20e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
Your Name
|
51701a485d
|
SDK菜单添加平台选型
|
5 years ago |
|
zyx
|
602e53e82f
|
合并分支dev_zyx财务部分的代码
|
5 years ago |
|
zhengchanglong
|
561b183bec
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
chenzhi
|
a9bc64a4b2
|
优化统计逻辑
|
5 years ago |
|
zhengchanglong
|
78e23d19b2
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
8fd435a324
|
月结统计，游戏查看名称修改
|
5 years ago |
|
zhengchanglong
|
e5c834e054
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
4dfec50ba5
|
月结统计修改
|
5 years ago |
|
chenzhi
|
0ae24bf2cd
|
优化财务聚合接口2
|
5 years ago |
|
chenzhi
|
58c405e914
|
优化财务聚合接口
|
5 years ago |
|
chenzhi
|
0df9045e67
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
f54305911c
|
优化api暂存
|
5 years ago |
|
ELF
|
6c6b3b54aa
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
ELF
|
7547e867bb
|
三级变四级修改
|
5 years ago |
|
chenzhi
|
eacdea6f9b
|
暂存修改
|
5 years ago |
|
chenzhi
|
81192f36c8
|
xiufu
|
5 years ago |
|
zhengchanglong
|
879accf9f5
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
f44a11a915
|
月结统计提示语修改
|
5 years ago |
|
chenzhi
|
2a7d4a435c
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
18be299b4c
|
同步dev
|
5 years ago |
|
zhengchanglong
|
78846c699f
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
9539b38e86
|
月结统计提示语修改
|
5 years ago |
|
jbrazz
|
48b1cdf66f
|
upt
|
5 years ago |
|
zhengchanglong
|
3c3a13c068
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
f0559c3576
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Application/Admin/View/Finance/index.html
|
5 years ago |
|
zyx
|
cfa33d3e42
|
月结统计提示语修改
|
5 years ago |
|
jbrazz
|
a8125bf377
|
upt
|
5 years ago |
|
zhengchanglong
|
9dd5a34bf7
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
chenzhi
|
50c775a78b
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
f9397efebf
|
修改总流水统计方式
|
5 years ago |
|
zhengchanglong
|
6dcd1549d0
|
Merge branch 'dev_zyx' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zyx
|
5a7432ef40
|
月结统计新增平台比收入字段，将平台币流水改为平台币支出
|
5 years ago |
|
chenzhi
|
c8da11a12e
|
新增平台币流水充值
|
5 years ago |
|
zyx
|
b6080180ab
|
测试资源bug修正
|
5 years ago |
|
chenzhi
|
b4c9f60ac9
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
ELF
|
b4168a23f1
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
8212b4ecaf
|
4级推广申请资源修正
|
5 years ago |
|
chenzhi
|
498de9ab75
|
同步dev
|
5 years ago |
|
ELF
|
689cc08b69
|
修改
|
5 years ago |
|
zhengchanglong
|
5b93736468
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
1201180f79
|
游戏到处删除玩家昵称栏位
|
5 years ago |
|
jbrazz
|
48de85a3c3
|
upt
|
5 years ago |
|
zhengchanglong
|
2c80186025
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
fcbf41fa65
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
zyx
|
27e8a0c0b5
|
提示栏文字调整,组长渠道与推广员渠道添加文字提示栏
|
5 years ago |
|
chenzhi
|
dcc5939692
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
b4b4e7bc00
|
新增强制重新更新
|
5 years ago |
|
zyx
|
a97ce09429
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
zyx
|
414f471ac1
|
提示栏文字调整
|
5 years ago |
|
zhengchanglong
|
bf24f74d00
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
chenzhi
|
c547d43330
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
d91a44184f
|
优化数据更新提示
|
5 years ago |
|
zyx
|
7167366949
|
提示栏文字调整
|
5 years ago |
|
zyx
|
064a3d0098
|
搜索框样式调整
|
5 years ago |
|
zyx
|
6f77f576d1
|
标签位置调整
|
5 years ago |
|
zyx
|
bbc75a419d
|
bug修正，样式更新
|
5 years ago |
|
zhengchanglong
|
fd97ecf494
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
chenzhi
|
fa29554923
|
肯定没错
|
5 years ago |
|
zhengchanglong
|
d554815d12
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
chenzhi
|
a1f22ad756
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
2e4067e1de
|
测试
|
5 years ago |
|
zhengchanglong
|
3da91ecb0f
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
e8fc252599
|
组长统计搜索bug修正
|
5 years ago |
|
zhengchanglong
|
cd70dd7dd8
|
Merge branch 'dev_zyx' into dev
|
5 years ago |