Commit Graph

7342 Commits (1c150f290e7685a36067d41098affcfd2013cdff)
 

Author SHA1 Message Date
chenzhi eeb1821859 暂存
郑永星 9b36a1c6bc Merge branch 'feature/add_item' of wmtx/platform into release
保留两位小数
zhengyongxing c829c56956 保留两位小数
郑永星 66902a13ec Merge branch 'feature/add_item' of wmtx/platform into release
内团去除比例结束时间减1
zhengyongxing 1717c2958b 最大值判断添加
zhengyongxing 4dd097667f 内团去除比例结束时间减1
郑永星 37d1419bb9 Merge branch 'feature/add_item' of wmtx/platform into release
最大值判断添加
zhengyongxing ff21751d31 最大值判断添加
万盟天下 8482cd9382 Merge branch 'feature/elf_version_1117' of wmtx/platform into release
修改游戏统计bug
ELF e46cc5b52e 修改bug
zhengyongxing 640cb01bbb 12月功能提交
张谷诚 ca605305e9 Merge branch 'feature/zgc_1126' of wmtx/platform into release
1126
tping 43c62c05d7 Merge branch 'release' into feature/zgc_1126
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
万盟天下 4557b3dc2f Merge branch 'feature/elf_version_1117' of wmtx/platform into release
修改游戏统计bug
ELF 47fcab323b 修改游戏统计bug
万盟天下 41ab9703a9 Merge branch 'feature/add_item' of wmtx/platform into release
11月功能提交
万盟天下 82cf73ede5 Merge branch 'feature/elf_version_1117' of wmtx/platform into release
游戏统计/后台登录时间修改
zhengyongxing b32f5efd91 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others
 Conflicts:
	Data/update.sql
zhengyongxing 46f33b3d05 12月功能提交
chenzhi 9da9941c9f 优化支付数据查看
zhengyongxing 3d1ab70123 11月功能提交
ELF f95125892a 优化推广员后台汇总查询
zhengyongxing 5c27c63835 11月功能提交
廖金灵 5c23366b73 Merge branch 'feature/promote_tg_dm' of wmtx/platform into master
根据推广公司配置推广后台
ELF 7468057834 推广员结算订单归属
zhengyongxing 9b87b9c4a1 11月功能提交
zhengyongxing 41e9820d83 11月功能提交
zhengyongxing e138517136 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 710439d8df 11月功能提交
ELF 289783eecd 修改
tping dd786dc27f 1126 批量上下架
tping b722175785 1126 权限
chenzhi 986065ab4b 优化名词
tping 033cd00aee 1126
zhengyongxing c749df4936 11月功能提交
tping d8924dc8be 1126 客服qq
zhengyongxing 36d40bc24e 11月功能提交
zhengyongxing 5add29fa6b 11月功能提交
zhengyongxing 8bce1bd12c Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 2040991894 11月功能提交
万盟天下 4f185eeb8a Merge branch 'feature/promote_tg_dm' of wmtx/platform into release
优化当前域名获取
ELF a0f57749c4 优化当前域名获取
万盟天下 e81ccd7d34 Merge branch 'feature/promote_tg_dm' of wmtx/platform into release
添加域名前缀限制
ELF ef8334dd18 添加域名前缀限制
chenzhi e7501be7c3 优化审核流程
万盟天下 b698b82409 Merge branch 'feature/promote_tg_dm' of wmtx/platform into release
根据推广公司配置推广后台
tping ff4975bacb 1126
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing a6263b2205 11月功能提交
张谷诚 ccd5b487a9 Merge branch 'hotfix/pay_notice1123' of wmtx/platform into master
支付通知 补单