Commit Graph

6603 Commits (4a7915ef69ee02b08fa530acceda820b34409033)
 

Author SHA1 Message Date
zyx 4a7915ef69 汇总状态的操作修改
zyx d42cd15b0b 汇总状态的操作修改
zyx 041006e1b4 汇总状态的操作修改
zyx 2c5889cd50 汇总状态的操作修改
zyx c692e51fa7 汇总状态的操作修改
zyx 52f4cbacb9 汇总状态的操作修改
zyx 178c86a751 撤销汇总添加退回审核状态
zhengyongxing 56593d5ee8 汇总bug修正
zhengyongxing dc5a65903b 汇总bug修正
zhengyongxing ef0c4427ce Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
zhengyongxing 4210bb7bf0 汇总bug修正
zhengyongxing b4bdcd24fc 汇总bug流程修正
zhengyongxing e153fb66ca 聚合重新汇总bug修正
万盟天下 9db2434d10 Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司绑定流程优化
zhengyongxing 2b4ed15a30 聚合公司绑定流程优化
郑永星 8b9c732f6a Merge branch 'feature/add_item' of wmtx/platform into master
审核拒绝bug修正
zhengyongxing 7d3c8ebd61 审核拒绝bug修正
万盟天下 1cb13ebb4c Merge branch 'feature/add_item' of wmtx/platform into master
聚合汇总bug修正
zhengyongxing a2b085562d 聚合汇总bug修正
万盟天下 11c02ca77e Merge branch 'release' of wmtx/platform into master
版本更新
ELF fbbc30c874 Merge branch 'master' of 47.111.118.107:wmtx/platform into release
ELF 4b12a050cc Merge branch 'release' of 47.111.118.107:wmtx/platform into release
万盟天下 bf1c302803 Merge branch 'hotfix/reset_data_session' of wmtx/platform into release
修改
ELF ca99068a0e 修改
郑永星 4f9c672aa1 Merge branch 'feature/add_item' of wmtx/platform into release
聚合公司绑定修正
zhengyongxing a977cf5f31 聚合公司绑定修正
郑永星 bdcc9a8e27 Merge branch 'hotfix/game_ratio_modify' of wmtx/platform into release
特殊比例bug修正
zhengyongxing 0dd7bceb3f 特殊比例bug修正
万盟天下 efa4c14c89 Merge branch 'hotfix/reset_data_session' of wmtx/platform into release
添加会长无需重新登录/补链通知
ELF 19c782b053 解决冲突
郑永星 2c8c246d31 Merge branch 'feature/add_item' of wmtx/platform into release
汇总权限测试
zhengyongxing 6b486331b5 汇总权限测试
郑永星 66af352eb8 Merge branch 'feature/add_item' of wmtx/platform into release
公司绑定修正
zhengyongxing f4f822d31a 公司绑定修正
郑永星 07e877af4b Merge branch 'feature/add_item' of wmtx/platform into release
绑定公司修正
zhengyongxing f757c10c61 绑定公司修正
郑永星 a825f4757a Merge branch 'feature/add_item' of wmtx/platform into release
小bug修改
zhengyongxing 0ebaf6ed64 小bug修改
ELF 0f534009b4 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
郑永星 af65b143bb Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
zhengyongxing c06e53ab31 汇总bug修正
郑永星 e593db626c Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
zhengyongxing 1e67b1d1a1 汇总bug修正
万盟天下 1ab2df37b6 Merge branch 'hotfix/add_while_view_recharge' of wmtx/platform into master
修改
ELF 2f4868553a 修改
万盟天下 c0c0bac16a Merge branch 'hotfix/add_while_view_recharge' of wmtx/platform into master
修改
陈志 92336383d5 Merge branch 'feature/new_statement_0925' of wmtx/platform into release
优化下游同游戏判断
chenzhi 12e8500ce3 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925
ELF ce1d061ee6 修改
郑永星 3e82b38c1c Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正