Commit Graph

249 Commits (e5c3ee02ae8493913f8e99efa99854b530df7053)

Author SHA1 Message Date
ELF f03fec9e43 Merge branch 'feature/promote' into dev
jbrazz e57dfd3fae 修改设备号查询
jbrazz f4a46335ca upt
jbrazz 7396e69a61 upt
jbrazz 380c930686 Merge branch 'featurer/ylw_4.0' into dev
jbrazz 52880f1a91 upt
zyx ce008b284e 月结统计bug修正
ELF 12016f1b34 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 679acf6cf1 修改分包
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c9996e071c fix grand_id
chenzhi 58db110844 合并
chenzhi 115bafc067 新增补链日期及取消补链功能
ELF 831456b333 解决冲突
chenzhi 7e37f3a2df 优化迁移用户addshifttask
jbrazz 9300280f78 merge feture/ylw
jbrazz 2dd1372b78 upt
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 5f673b346d 月结统计添加部长渠道
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote
chenzhi 9a6c75b41d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi a653b46f0e 优化月份统计接口新增事务
jbrazz 8a2c99681a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi c2e686c38e 123
chenzhi 537ed0857a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 9d09fa4665 4角色聚合
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 9e9d742275 导出添加引号
zhengchanglong 943564f82d Merge branch 'dev_zyx' into dev
zyx d5a90238ec 导出加大默认内存
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz 68df391d9c upt
zhengchanglong 0223ecb125 Merge branch 'dev_zyx' into dev
zyx 35e1b2631a 导出添加游戏订单号
zhengchanglong 945ea1173a Merge branch 'dev_zyx' into dev
zyx a307bf343e 游戏详情查看导出,按日期分成多个sheet
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev
zyx 7e4aaf0a2e Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 266202c06b 游戏详情查看导出,按日期分成多个sheet
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 51701a485d SDK菜单添加平台选型
zyx 602e53e82f 合并分支dev_zyx财务部分的代码
zhengchanglong 561b183bec Merge branch 'dev_zyx' into dev
chenzhi a9bc64a4b2 优化统计逻辑
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev
zyx 4dfec50ba5 月结统计修改
chenzhi 0ae24bf2cd 优化财务聚合接口2
chenzhi 58c405e914 优化财务聚合接口
chenzhi 0df9045e67 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi f54305911c 优化api暂存
ELF 6c6b3b54aa Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 7547e867bb 三级变四级修改
chenzhi eacdea6f9b 暂存修改
chenzhi 81192f36c8 xiufu
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 18be299b4c 同步dev
jbrazz 48b1cdf66f upt
jbrazz a8125bf377 upt
zhengchanglong 9dd5a34bf7 Merge branch 'dev_zyx' into dev
chenzhi 50c775a78b Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi f9397efebf 修改总流水统计方式
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Data/update.sql
zyx 5a7432ef40 月结统计新增平台比收入字段,将平台币流水改为平台币支出
chenzhi c8da11a12e 新增平台币流水充值
chenzhi b4c9f60ac9 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF b4168a23f1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 8212b4ecaf 4级推广申请资源修正
chenzhi 498de9ab75 同步dev
ELF 689cc08b69 修改
zhengchanglong 5b93736468 Merge branch 'dev_zyx' into dev
zyx 1201180f79 游戏到处删除玩家昵称栏位
jbrazz 48de85a3c3 upt
zhengchanglong 2c80186025 Merge branch 'dev_zyx' into dev
chenzhi b4b4e7bc00 新增强制重新更新
zhengchanglong bf24f74d00 Merge branch 'dev_zyx' into dev
chenzhi c547d43330 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi d91a44184f 优化数据更新提示
zyx bbc75a419d bug修正,样式更新
zhengchanglong fd97ecf494 Merge branch 'dev_zyx' into dev
chenzhi fa29554923 肯定没错
zhengchanglong d554815d12 Merge branch 'dev_zyx' into dev
chenzhi a1f22ad756 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 2e4067e1de 测试
zhengchanglong 3da91ecb0f Merge branch 'dev_zyx' into dev
zyx e8fc252599 组长统计搜索bug修正
zhengchanglong cd70dd7dd8 Merge branch 'dev_zyx' into dev
zyx 515ffa25b9 月结统计bug修正
chenzhi 3983a086ac 优化生成数据
chenzhi 8796458ead 聚合新增月份
Your Name 7466b90d13 SDK菜单修改
Your Name ed3ce2b4b5 SDK菜单修改
Your Name 2569850407 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name c90c397dd9 SDK菜单修改
chenzhi af05f08689 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 4f7077a3ec 10311331
zyx f16bf0b606 月结统计筛选列表逻辑修正
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev
zyx 63dff98660 月结统计导出bug修正
zyx b42f621dbc 财务管理功能提交
zyx da1686fe14 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx