Commit Graph

6626 Commits (1e89dd36b9b069081abcceaddd48f7c47c5c7b79)
 

Author SHA1 Message Date
廖金灵 1e89dd36b9 Merge branch 'feature/promote_level_sys' of wmtx/platform into master
评级显示给组长/推广员
ELF dec6c4b222 修改权限
廖金灵 480d899152 Merge branch 'hotfix/chang_conmpany_card' of wmtx/platform into master
优化银行卡号不限制
chenzhi f311da5208 优化银行卡号不限制
廖金灵 004f641d60 Merge branch 'feature/add_item' of wmtx/platform into master
聚合重新汇总bug修正
zyx f028794473 Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
zyx a2d68a2752 汇总状态的操作修改
zyx 5bec0ba91c 汇总状态的操作修改
zyx c99cad808c 汇总状态的操作修改
zyx 4a7915ef69 汇总状态的操作修改
zyx d42cd15b0b 汇总状态的操作修改
zyx 041006e1b4 汇总状态的操作修改
zyx 2c5889cd50 汇总状态的操作修改
zyx c692e51fa7 汇总状态的操作修改
zyx 52f4cbacb9 汇总状态的操作修改
zyx 178c86a751 撤销汇总添加退回审核状态
zhengyongxing 56593d5ee8 汇总bug修正
万盟天下 c3ff827b69 Merge branch 'feature/promote_level_sys' of wmtx/platform into master
评级系统
zhengyongxing dc5a65903b 汇总bug修正
ELF e493eedc3f Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_level_sys
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修正
ELF 8d1a58d583 修改
ELF d33bb3f3f8 修改
zhengyongxing b4bdcd24fc 汇总bug流程修正
ELF 2ae89b9edb 解决冲突
ELF 95248d3582 修改
zhengyongxing e153fb66ca 聚合重新汇总bug修正
万盟天下 9db2434d10 Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司绑定流程优化
zhengyongxing 2b4ed15a30 聚合公司绑定流程优化
ELF 0169d8a2db 修改
郑永星 1eef1ea4c3 Merge branch 'feature/add_item' of wmtx/platform into release
审核拒绝bug修正
郑永星 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修正
ELF c42a123ad7 修改
ELF 9b11202deb 修改
ELF 28fbbff699 修改
ELF 8d2e61153b 修改
elf@home c4eb04428e 修改
ELF afad195062 修改
万盟天下 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修正