Commit Graph

3854 Commits (f4f430cf610b035c2fa77a3d6784be5e576a2aa0)

Author SHA1 Message Date
chenzhi 73f8c16379 游戏统计修改bug
郑永星 89909c10fd Merge branch 'feature/add_item' of wmtx/platform into release
小数点保留
zhengyongxing ed8d1fee0a 小数点保留
郑永星 d090b707dc Merge branch 'feature/add_item' of wmtx/platform into release
小数点保留两位添加
zhengyongxing b54b2660d4 小数点保留两位添加
郑永星 a866fd6b8d Merge branch 'feature/add_item' of wmtx/platform into release
保留两位小数判断
zhengyongxing 711992a287 保留两位小数判断
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
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
chenzhi 9da9941c9f 优化支付数据查看
zhengyongxing 3d1ab70123 11月功能提交
zhengyongxing 5c27c63835 11月功能提交
廖金灵 5c23366b73 Merge branch 'feature/promote_tg_dm' of wmtx/platform into master
根据推广公司配置推广后台
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月功能提交
ELF ef8334dd18 添加域名前缀限制
chenzhi e7501be7c3 优化审核流程
tping ff4975bacb 1126
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing a6263b2205 11月功能提交
tping 3471639489 支付通知 补单
tping 103acdd15d 支付通知 小数点后面.00
chenzhi 5bdc0e6f6e 优化汇总方案
tping 0d52dc7d61 1126
chenzhi 55dd67e34d 优化撤回
chenzhi 56681580dd 合并
chenzhi 6d4fce53eb 优化线下打款
chenzhi bd125be3dd 优化汇总审核流程
ELF c339623c78 优化
elf@home dd66846e68 根据推广公司配置推广后台
zhengyongxing 1626640066 11月功能提交
ELF 773068b57c 优化代码
zhengyongxing 4eff2f0aaa 11月功能提交
zhengyongxing d6b1916a5d 11月功能提交
ELF dd7068e3ae 改用redis存储session
tping 025d90f5fa 1126
chenzhi ad1d4e65a5 优化游戏汇总
chenzhi bea27fd5de 优化游戏汇总
tping c75d73c9f7 1126
ELF 6a50654045 游戏统计/后台登录时间修改
chenzhi 7f9bb248dd 优化推广员统计
chenzhi 1f694ef47b 优化推广员充值
chenzhi e896f5e649 Merge branch 'master' of 47.111.118.107:wmtx/platform into fix/company_20201111
chenzhi a6f9d82245 优化推广员累计注册
chenzhi 7a876e01ab 优化新增推广员汇总
zhengyongxing f49cd75e86 11月功能提交
zhengyongxing 6811eb806c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
	Application/Admin/Controller/CompanyStatementSetController.class.php
	Data/update.sql
廖金灵 da2dc09690 Merge branch 'new_change' of wmtx/platform into master
汇总bug修改
zhengyongxing e098384635 汇总bug修改
zhengyongxing 3656c555d1 11月功能提交
chenzhi ffd8c92940 优化奖罚
ELF 89332c0d54 解决冲突
ELF eef296ea08 发放资源自动审核/发放优化
ELF b92f564a49 发放资源自动审核/发放优化
ELF c550846454 修改
zhengyongxing 4526b5b741 11月功能提交
ELF ceadb8562f 新增60/90日留存率统计
ELF 5253a76963 优化
ELF afc95791d2 优化
chenzhi d0a61d3e87 游戏充值导出新增cp列
ELF d0b2e5f459 优化
ELF 07f7bca3ee 修改
ELF 47ca2f2b9e 修改
ELF e1352fea1e 修改
chenzhi cdd1cd7d7f 优化页面页数
ELF dd71ccdf83 修改
廖金灵 648cde1eff Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
推广员信息显示通过权限控制
ELF 53f3ad6864 优化
廖金灵 38dc6c0c56 Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
市场专员信息显示通过权限控制
ELF dfdc31f4dc 市场专员信息显示通过权限控制
zhengyongxing 6021f91604 公会订单添加所属商户
zhengyongxing 3f04fa1507 公会统计商户名称修改
zhengyongxing deee3228dd 公会统计商户导出