7208 Commits (19f74062981a37b98079c6792a301d305a53c7a3)
 

Author SHA1 Message Date
陈志 4da7fa623f Merge branch 'feature/add_item' of wmtx/platform into release
优化新增仅单参与结算是结算
4 years ago
chenzhi 5e9723b040 优化新增仅单参与结算是结算 4 years ago
chenzhi 74d9d6ed18 优化充值操作 4 years ago
郑永星 9a008d2bfc Merge branch 'feature/add_item' of wmtx/platform into release
换行字数修正
4 years ago
zhengyongxing b54b37e99c 换行字数修正 4 years ago
郑永星 4262b55a66 Merge branch 'feature/add_item' of wmtx/platform into release
市场业绩bug修正
4 years ago
zhengyongxing 59ec6c28ca 市场业绩bug修正 4 years ago
万盟天下 f2ac50f9c5 Merge branch 'feature/game_select_bug' of wmtx/platform into master
游戏统计修改bug
4 years ago
陈志 ff23d13c54 Merge branch 'feature/game_select_bug' of wmtx/platform into release 4 years ago
chenzhi 73f8c16379 游戏统计修改bug 4 years ago
郑永星 89909c10fd Merge branch 'feature/add_item' of wmtx/platform into release
小数点保留
4 years ago
zhengyongxing ed8d1fee0a 小数点保留 4 years ago
郑永星 d090b707dc Merge branch 'feature/add_item' of wmtx/platform into release
小数点保留两位添加
4 years ago
zhengyongxing b54b2660d4 小数点保留两位添加 4 years ago
郑永星 a866fd6b8d Merge branch 'feature/add_item' of wmtx/platform into release
保留两位小数判断
4 years ago
zhengyongxing 711992a287 保留两位小数判断 4 years ago
chenzhi eeb1821859 暂存 4 years ago
郑永星 9b36a1c6bc Merge branch 'feature/add_item' of wmtx/platform into release
保留两位小数
4 years ago
zhengyongxing c829c56956 保留两位小数 4 years ago
郑永星 66902a13ec Merge branch 'feature/add_item' of wmtx/platform into release
内团去除比例结束时间减1
4 years ago
zhengyongxing 1717c2958b 最大值判断添加 4 years ago
zhengyongxing 4dd097667f 内团去除比例结束时间减1 4 years ago
郑永星 37d1419bb9 Merge branch 'feature/add_item' of wmtx/platform into release
最大值判断添加
4 years ago
zhengyongxing ff21751d31 最大值判断添加 4 years ago
万盟天下 8482cd9382 Merge branch 'feature/elf_version_1117' of wmtx/platform into release
修改游戏统计bug
4 years ago
ELF e46cc5b52e 修改bug 4 years ago
zhengyongxing 640cb01bbb 12月功能提交 4 years ago
张谷诚 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